Improve android_app* handling