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