Merge vulkan-cts-1.0.2 into goog/oc-dev
authorPyry Haulos <phaulos@google.com>
Fri, 7 Apr 2017 00:44:25 +0000 (00:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 00:44:25 +0000 (00:44 +0000)
am: 605556c673

Change-Id: I44b218450c8f6208594294be0aa07db2f2224c0d


Trivial merge