main
gh-146445: Migrate Android build tools to the Platforms folder. (#148282)
Minor fixes for Android (#154895)