Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pi-merge-fixes
authorChris Forbes <chrisforbes@google.com>
Mon, 9 Apr 2018 19:24:26 +0000 (12:24 -0700)
committerChris Forbes <chrisforbes@google.com>
Mon, 9 Apr 2018 19:46:47 +0000 (12:46 -0700)
Bug: b/77812821
Test: run on pixel

Change-Id: If4833fd61a4e11b87152b1ff392490f839317da5


Trivial merge