Merge remote-tracking branch 'goog/upstream-vulkan-cts-next' into vulkan-cts-1.1...
authorChris Forbes <chrisforbes@google.com>
Fri, 9 Mar 2018 20:04:24 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Mar 2018 20:04:24 +0000 (20:04 +0000)
am: a76eb94eda

Change-Id: I76102892215fd2089df7ee5d04b191243cb44b29


Trivial merge