Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 11 Apr 2018 08:48:52 +0000 (10:48 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 11 Apr 2018 08:48:52 +0000 (10:48 +0200)
Change-Id: I945204f314bc75c95e8b6c4056b01d24911bb92c


Trivial merge