Merge "Misc Vulkan framework fixes" into vulkan
authorPyry Haulos <phaulos@google.com>
Tue, 4 Aug 2015 21:11:23 +0000 (21:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Aug 2015 21:11:23 +0000 (21:11 +0000)

Trivial merge