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

Change-Id: I11090976693bc93d2c7e788787117d8827085307


Trivial merge