Merge "Don't rely on default argument of NDK API." into main