Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Mon, 8 May 2017 20:12:06 +0000 (13:12 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 8 May 2017 20:12:06 +0000 (13:12 -0700)
Change-Id: Ice939f27162062bcc5405315432a2732ebbe8afb


Trivial merge