Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Tue, 16 May 2017 16:12:09 +0000 (09:12 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 16 May 2017 16:12:09 +0000 (09:12 -0700)
Change-Id: Iee00ded195e3178e685470b19df25a9b352ddfb5


Trivial merge