resolve merge conflicts of 59febde93 to master

Change-Id: Ice0a23a345585d035b6fc7a869444459ebbbb9a3

diff --cc android/cts/master/vk-master.txt
Simple merge

diff --cc scripts/build_android_mustpass.py
index e2e8815,f211041..1fa117b
--- 1/scripts/build_android_mustpass.py
--- 2/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@@ -500,6 -502,8 +500,7 @@@ MASTER_VULKAN_FILTERS                      = 
                exclude("vk-not-applicable.txt"),
                exclude("vk-excluded-tests.txt"),
                exclude("vk-test-issues.txt"),
 -              exclude("vk-temporary-exclusions.txt")
+               exclude("vk-waivers.txt"),
        ]
  MASTER_VULKAN_PKG                             = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",