Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Thu, 18 May 2017 23:02:57 +0000 (16:02 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 18 May 2017 23:02:57 +0000 (16:02 -0700)
Change-Id: I305e5144dee58d10e2284e1824d9d4683a9c67d8


Trivial merge