Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 00:10:30 +0000 (17:10 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 3 Apr 2017 00:10:30 +0000 (17:10 -0700)
Change-Id: I97a51b711e6d515c2f86c113ce8ad8ca45c37183


Trivial merge