Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Thu, 9 Mar 2017 23:01:35 +0000 (15:01 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 9 Mar 2017 23:01:35 +0000 (15:01 -0800)
Change-Id: I56bcaca8068dd1922af827f35253319b1106d5dd


Trivial merge