Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-merge-fixes
authorChris Forbes <chrisforbes@google.com>
Tue, 10 Apr 2018 19:42:02 +0000 (12:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Apr 2018 19:42:02 +0000 (12:42 -0700)
am: c0290d01a1

Change-Id: Ieabba26e1904be9ad89c5cc8f99754458c9f820a


Trivial merge