[RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into...
authorChris Forbes <chrisforbes@google.com>
Mon, 27 Aug 2018 19:40:51 +0000 (12:40 -0700)
committerChris Forbes <chrisforbes@google.com>
Mon, 27 Aug 2018 19:59:02 +0000 (12:59 -0700)
Bug: b/113276290

Change-Id: I77d325ade51309e96151c77804f97f86c3712117


Trivial merge