[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulka...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Mon, 30 Apr 2018 17:32:26 +0000 (10:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:32:26 +0000 (10:32 -0700)
am: 354706417a  -s ours

Change-Id: I37e6dad1ab2d2eb9bee4a529f16c77981afbb54b


Trivial merge