Merge "Merge Vulkan CTS 1.0.2.4 into aosp/master" am: 0f5658c72b
authorMika Isojarvi <misojarvi@google.com>
Mon, 17 Jul 2017 20:22:15 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Jul 2017 20:22:15 +0000 (20:22 +0000)
am: 0419094593

Change-Id: I639549484f0f0300cd6a961bf5fe4fbb8a09f922


Trivial merge