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

Change-Id: I8e723a11a643eee457e8d392072f739558226006


Trivial merge