Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 19:43:39 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 19:43:39 +0000 (19:43 +0000)
am: 68408cad8f

Change-Id: I80f0e00e63ebbfe674b4f5d60e5da1a72084066b


Trivial merge