[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:37:02 +0000 (10:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:37:02 +0000 (10:37 -0700)
am: ea8d8c6e51  -s ours

Change-Id: I4198a0ed4f80ff23cb9d55f7ff8e75ccf900a4f2


Trivial merge