Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:52 +0000 (12:45 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:52 +0000 (12:45 -0800)
Change-Id: I650f4ef2c848a0957f652b3bf8b17ee7a7e4319c


Trivial merge