Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 17:53:03 +0000 (10:53 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 17:53:03 +0000 (10:53 -0700)
Change-Id: I2d372c38240ffa856509c479b4f24b03ca95649c


Trivial merge