Merge in fixes from Khronos Vulkan CTS repository
authorPyry Haulos <phaulos@google.com>
Wed, 9 Mar 2016 20:37:33 +0000 (12:37 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 9 Mar 2016 20:37:33 +0000 (12:37 -0800)

Trivial merge