Merge "Merge "vulkan: do not use exported functions internally" into nyc-dev...
Merge "Merge "vulkan: do not use exported functions internally" into nyc-dev am: e6759c3d am: 4db4cd57" into nyc-mr1-dev-plus-aosp
am: a7894d79
* commit 'a7894d79':
Change-Id: I977f043e6e75fb62e6513260d75e50c14718399b