Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-april-fixes
authorChris Forbes <chrisforbes@google.com>
Mon, 23 Apr 2018 17:41:00 +0000 (10:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Apr 2018 17:41:00 +0000 (10:41 -0700)
am: 60efbe2df0

Change-Id: I4f9bdada8382851991a60523eaebfc8d7bdfc641


Trivial merge