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

Change-Id: I63b4463f99fa95a3233343663a5c3b9403550597


Trivial merge