Merge "Remove unused VNDK-related function" into main