Merge in code from Khronos Vulkan CTS repo
authorPyry Haulos <phaulos@google.com>
Thu, 19 May 2016 19:34:23 +0000 (12:34 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 19 May 2016 19:34:23 +0000 (12:34 -0700)

Trivial merge