Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:13 +0000 (16:25 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:13 +0000 (16:25 -0800)
Change-Id: I33cca201217f9c9a258c61e0bb6178bb7694a96e


Trivial merge