Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 8 May 2017 21:24:46 +0000 (14:24 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 8 May 2017 21:24:46 +0000 (14:24 -0700)
Change-Id: I0d69c6c9d5720d3c9f957244de84ca0b5a0ad906


Trivial merge