Build of assorted_fixes branch 81633a52b6bc8052e8322c1427a44a1484264b15

Build for Android API level 21 (somewhere in the Android 5.x versions, see https://apilevels.com/) built with Android ndk r26c

With commandergenius branch basiliskii_build_wip rakslice/commandergenius@e9638a5