Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
authorChris Forbes <chrisforbes@google.com>
Tue, 10 Jul 2018 20:33:49 +0000 (13:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jul 2018 20:33:49 +0000 (13:33 -0700)
am: 6e9239c7ad

Change-Id: Ia77474e9bfeea7c8f878eb50c2af58a10a577090


Trivial merge