[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:44:08 +0000 (10:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:44:08 +0000 (10:44 -0700)
am: d496dc5ba1

Change-Id: Ide9aaa6f6834f5060f179188434c8f69d286ce68


Trivial merge