Snap for 4379964 from d81d8e2af798d6650d1de3e1389d0ea8fe471446 to oreo-cts-release

Change-Id: I833f68e69d46d235f9b74a8bb2ca33e38a55fd0b
diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt
index fa5265a..4be93b1 100644
--- a/android/cts/master/src/vk-excluded-tests.txt
+++ b/android/cts/master/src/vk-excluded-tests.txt
@@ -338,3 +338,8 @@
 
 # Issue: b/65844886
 dEQP-VK.image.mutable.*
+
+# Issue: b/67013571
+dEQP-VK.ubo.random.all_out_of_order_offsets.11
+dEQP-VK.ubo.random.all_out_of_order_offsets.45
+dEQP-VK.ubo.random.all_shared_buffer.48
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 0a95838..e134766 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -169760,7 +169760,6 @@
 dEQP-VK.ubo.random.all_shared_buffer.45
 dEQP-VK.ubo.random.all_shared_buffer.46
 dEQP-VK.ubo.random.all_shared_buffer.47
-dEQP-VK.ubo.random.all_shared_buffer.48
 dEQP-VK.ubo.random.all_shared_buffer.49
 dEQP-VK.ubo.random.all_out_of_order_offsets.0
 dEQP-VK.ubo.random.all_out_of_order_offsets.1
@@ -169773,7 +169772,6 @@
 dEQP-VK.ubo.random.all_out_of_order_offsets.8
 dEQP-VK.ubo.random.all_out_of_order_offsets.9
 dEQP-VK.ubo.random.all_out_of_order_offsets.10
-dEQP-VK.ubo.random.all_out_of_order_offsets.11
 dEQP-VK.ubo.random.all_out_of_order_offsets.12
 dEQP-VK.ubo.random.all_out_of_order_offsets.13
 dEQP-VK.ubo.random.all_out_of_order_offsets.14
@@ -169807,7 +169805,6 @@
 dEQP-VK.ubo.random.all_out_of_order_offsets.42
 dEQP-VK.ubo.random.all_out_of_order_offsets.43
 dEQP-VK.ubo.random.all_out_of_order_offsets.44
-dEQP-VK.ubo.random.all_out_of_order_offsets.45
 dEQP-VK.ubo.random.all_out_of_order_offsets.46
 dEQP-VK.ubo.random.all_out_of_order_offsets.47
 dEQP-VK.ubo.random.all_out_of_order_offsets.48