Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
authorChris Forbes <chrisforbes@google.com>
Mon, 9 Jul 2018 21:20:32 +0000 (14:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Jul 2018 21:20:32 +0000 (14:20 -0700)
am: 947ee3c60c

Change-Id: Ia78a467b59a539f6adc447aa5e59f6c018c0a329


Trivial merge