Add APK and JAR support