FIX: several regressions on APK generation.