Snap for 6630229 from 0fa7833a8bddffa67afad1f069583f2651afdd37 to rvc-release

Change-Id: I33134f863a4a090ec4ea4b3f859ca19780868509
diff --git a/android/cts/master/src/vk-test-issues.txt b/android/cts/master/src/vk-test-issues.txt
index e5f64e7..6ea8c91 100644
--- a/android/cts/master/src/vk-test-issues.txt
+++ b/android/cts/master/src/vk-test-issues.txt
@@ -10,3 +10,6 @@
 
 # b/135200048: Compile time is unreasonable on low-end parts, revisit for R
 dEQP-VK.ssbo.layout.random.scalar.75
+
+# b/156595708: Randomly generated shader is unusually large compared to the others.
+dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt
index 9010059..178dca7 100644
--- a/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@ -98659,7 +98659,6 @@
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.10
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.11
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.12
-dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.14
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.15
 dEQP-VK.ssbo.phys.layout.random.16bit.scalar.16
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 5a17a98..ea94040 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
Binary files differ