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

Change-Id: I05b18f9180285aa9b140b63f132020874d83e9d4


Trivial merge