Merge vulkan-cts-1.0-dev from Khronos repo to master
authorPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:15:06 +0000 (08:15 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 27 May 2016 15:15:25 +0000 (08:15 -0700)

Trivial merge