Merge tag 'android-m-preview-2'

Android m preview 2

Change-Id: Ib852580dce3fd4af91cf402be6fdc83b5f8d8f85

diff --cc libcsc/csc.c
index 8608dee66c5a62e5473890a5729853701cf2815e,f16502acad6d5dca4a77d5042a58e62a9eeeaefd..d619641e984f5e13d63832a97582da67629e1e49
--- 1/libcsc/csc.c
--- 2/libcsc/csc.c
+++ b/libcsc/csc.c
@@@ -29,8 -29,8 +29,9 @@@
   */
  #define LOG_TAG "libcsc"
  #include <cutils/log.h>
 +#include <errno.h>
  
+ #include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <utils/Log.h>