Merge vulkan-cts-1.0.2 into goog/oc-dev am: 605556c673
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 21:12:43 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:12:43 +0000 (21:12 +0000)
am: f3c5fbe817

Change-Id: I5fb848c6bf6c430003501eb4f87ef253eadab907


Trivial merge