resolve merge conflicts of bf8899d41 to oc-dev-plus-aosp

Change-Id: I05d0a671554b7455b9773a670080fd04f419360d

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

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