Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:17 +0000 (09:58 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:17 +0000 (09:58 -0800)
Change-Id: If550d50796597ec466efb30b1cbbd9aab4b13890


Trivial merge