Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
authorChris Forbes <chrisforbes@google.com>
Mon, 13 Aug 2018 23:26:24 +0000 (16:26 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Aug 2018 23:26:24 +0000 (16:26 -0700)
am: d502cf9784

Change-Id: I070ab06a20d335f4fdb8286d51c64da2cb61836c


Trivial merge