Merge vulkan-cts-1.0.2 into aosp/master am: 55da06144c am: d905a013d0 am: c91ce3f2a2
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 21:12:19 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:12:19 +0000 (21:12 +0000)
am: dca02bef80

Change-Id: Ic10cb6f345c317690f6a074cf870413895ccaf57


Trivial merge