also, pull in upstream p4a dockerfile changes https://github.com/kivy/python-for-android/pull/2231 https://github.com/kivy/python-for-android/pull/2218
485422b072