Merge pull request #142771 from primeos/android-tools
authored by Sandro and committed by GitHub 4 years ago 113fcf34 aae7b95f