Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Tue, 1 May 2018 17:23:07 +0000 (17:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 1 May 2018 17:23:07 +0000 (17:23 +0000)

Trivial merge