Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 5f69b27051 am: 399f8849cf...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:33:27 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:33:27 +0000 (18:33 +0000)
am: 9265197311

Change-Id: Ic2309f6d074825c627da75283f9add3fa05dcafc


Trivial merge