Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 43e50db72d am: ae92b0c427...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:41:51 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:41:51 +0000 (18:41 +0000)
am: 43504e99d2

Change-Id: Ic3505c2eca7370451f5243c88a77bc41e226932c


Trivial merge