[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:52:35 +0000 (10:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:52:35 +0000 (10:52 -0700)
am: 93b3acbf1e  -s ours

Change-Id: I817dfabfcdca5c9944053c10774dffd97c7ed2f8


Trivial merge