Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:37:17 +0000 (10:37 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:37:17 +0000 (10:37 -0700)
Change-Id: Ib189ff26f3bb7e049f5e0c4345e523cc39e91d4f


Trivial merge