Merge "Merge changes from topic \'vulkan-mem-limits\' into nyc-dev am: a7756de am...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 22 Apr 2016 21:43:56 +0000 (21:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Apr 2016 21:43:56 +0000 (21:43 +0000)

Trivial merge