Merge vulkan-cts-1.0.2 into aosp/master am: 55da06144c am: d905a013d0 am: c91ce3f2a2
authorPyry Haulos <phaulos@google.com>
Thu, 6 Apr 2017 22:59:58 +0000 (22:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 22:59:58 +0000 (22:59 +0000)
am: dca02bef80

Change-Id: I9b2783249e92a0bad6dd04ac3f973738df521883


Trivial merge