Merge remote-tracking branch 'aosp/master' into deqp-dev

 Conflicts:
	Android.mk
	android/cts/master/src/vk-excluded-tests.txt
	android/cts/master/vk-master.txt
	modules/glshared/glsBuiltinPrecisionTests.cpp

Change-Id: Ic6d2f5de1465158d9f105f9648f117d7b2b915a6

diff --cc Android.mk
index d82732b,07c3086..6f6e7cc
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -25,7 -1024,11 +25,9 @@@ deqp_compile_flags := 
        -DDE_ANDROID_API=9 \
        -D_XOPEN_SOURCE=600 \
        -DDEQP_TARGET_NAME=\"android\" \
 -      -DDEQP_GLES3_RUNTIME_LOAD=1 \
 -      -DDEQP_GLES2_RUNTIME_LOAD=1 \
        -DQP_SUPPORT_PNG=1 \
+       -Wall \
+       -Werror \
        -Wconversion \
        -fwrapv \
        -Wno-sign-conversion

diff --cc CMakeLists.txt
Simple merge

diff --cc android/package/Android.mk
Simple merge

diff --cc modules/egl/teglWideColorTests.cpp
index 898cdda,31afd28..3c50259
--- 1/modules/egl/teglWideColorTests.cpp
--- 2/modules/egl/teglWideColorTests.cpp
+++ b/modules/egl/teglWideColorTests.cpp
@@@ -100,7 -100,9 +100,8 @@@ public
        void                            init                                            (void);
        void                            deinit                                          (void);
        void                            checkPixelFloatSupport          (void);
+       void                            checkColorSpaceSupport          (void);
        void                            checkDisplayP3Support           (void);
 -      void                            checkDisplayP3LinearSupport (void);
        void                            check1010102Support                     (void);
        void                            checkFP16Support                        (void);
        void                            checkSCRGBSupport                       (void);