patches/ports-android-app: merge