[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulka...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Tue, 1 May 2018 17:41:35 +0000 (10:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:41:35 +0000 (10:41 -0700)
am: b42c18f792  -s ours

Change-Id: I2caad18103299cdd4a44db0ae4562442a5a711a8


Trivial merge