Merge vk-gl-cts-public/master into aosp/deqp-dev

Change-Id: I48249f54d401d1dc8668690f9f30c6d5f57ab642

diff --cc AndroidGen.mk
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/CMakeLists.txt
index 8a461c5,ab44b98..5c94ee7
--- 1/external/vulkancts/modules/vulkan/api/CMakeLists.txt
--- 2/external/vulkancts/modules/vulkan/api/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/api/CMakeLists.txt
@@@ -46,9 -46,9 +46,10 @@@ set(DEQP_VK_API_SRC
        )
  
  set(DEQP_VK_API_LIBS
+       deqp-vk-package
        tcutil
        vkutil
 +      deqp-vk-package
        )
  
  add_library(deqp-vk-api STATIC ${DEQP_VK_API_SRCS})

diff --cc framework/egl/wrapper/eglwEnums.inl
Simple merge

diff --cc framework/egl/wrapper/eglwEnumsC.inl
Simple merge

diff --cc scripts/egl/common.py
Simple merge