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

Change-Id: I5cca00d1f902a169550e2077e17c2fd52cb7ac9b


Trivial merge