Merge vulkan-cts-1.0 to master
authorPyry Haulos <phaulos@google.com>
Wed, 24 Feb 2016 21:15:16 +0000 (13:15 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 24 Feb 2016 21:15:16 +0000 (13:15 -0800)

Trivial merge