Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 18:05:20 +0000 (11:05 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 18:05:20 +0000 (11:05 -0700)
Change-Id: Ib5a98bc9b3c1781a6d4a6ca5eaabe74aee42badf


Trivial merge