Merge Vulkan CTS 1.0.2.5 into aosp/master am: 76a147bf66 am: 9f330c685b
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 22:46:27 +0000 (22:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 22:46:27 +0000 (22:46 +0000)
am: 9f305bdded

Change-Id: I388c5e497cef6c20e57704e313a115ca2b78383b


Trivial merge