Fix APK packaging