[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:55:42 +0000 (10:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:55:42 +0000 (10:55 -0700)
am: 43e7ea94f9

Change-Id: Ifc691bfc9d81d3ba6749f2f63686ec3de272f440


Trivial merge