Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 17:32:13 +0000 (09:32 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 17:32:13 +0000 (09:32 -0800)
Change-Id: Id23cc2f5a2ff4238fbf56d8c9cd4330dd166971a


Trivial merge