Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Mon, 22 May 2017 19:44:03 +0000 (12:44 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 22 May 2017 19:44:03 +0000 (12:44 -0700)
Change-Id: I7d89570a93664a95736113863921985ee1af9d6c


Trivial merge