Merge "Remove NDK exports" into main