gh-71052: Fix several Android build issues#115955

erlend-aasland merged 2 commits intopython:mainpython/cpython:mainfrom

mhsmith:android-buildmhsmith/cpython:android-buildCopy head branch name to clipboard