Merge "Merge "vulkan: do not use exported functions internally" into nyc-dev am: e6759c3d88 am: 4db4cd57b3" into nyc-mr1-dev-plus-aosp
am: a7894d7964

* commit 'a7894d7964eb6489b3430cee629d3a4c1abbf4e3':

Change-Id: I977f043e6e75fb62e6513260d75e50c14718399b