Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)
Change-Id: Ie1fb552e9f5e1c00ea0c986579e6e81681fdf9c1


Trivial merge