Merge vk-gl-cts-public/master into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 27 Feb 2017 06:12:52 +0000 (22:12 -0800)
committerPyry Haulos <phaulos@google.com>
Mon, 27 Feb 2017 06:12:52 +0000 (22:12 -0800)

Trivial merge