Merge in changes from Khronos Vulkan CTS repository
authorPyry Haulos <phaulos@google.com>
Mon, 1 Feb 2016 22:47:34 +0000 (14:47 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 1 Feb 2016 22:48:03 +0000 (14:48 -0800)
Change-Id: I61bcc9495e67a98227292ab354b63152df79193c


Trivial merge