diff --git a/Browser/Android.bp b/Browser/Android.bp
deleted file mode 100644
index 6505ecd45633aaebb81f2f76870efc0db75b9f39..0000000000000000000000000000000000000000
--- a/Browser/Android.bp
+++ /dev/null
@@ -1,91 +0,0 @@
-android_app_import {
-    name: "Browser",
-    product_specific: true,
-    compile_multilib: "both",
-    certificate: "platform",
-    required: [
-        "TrichromeLibrary",
-        "BrowserWebView"
-    ],
-    arch: {
-        arm: {
-            apk: "arm/TrichromeChrome.apk",
-        },
-        arm64: {
-            apk: "arm64/TrichromeChrome.apk",
-        },
-        x86: {
-            apk: "x86/TrichromeChrome.apk",
-        },
-        x86_64: {
-            apk: "x64/TrichromeChrome.apk",
-        },
-    },
-    optional_uses_libs: [
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-    ],
-    overrides: [
-        "Jelly",
-        "Browser2",
-        "QuickSearchBox",
-    ],
-    dex_preopt: {
-        enabled: false,
-    },
-}
-
-android_app_import {
-    name: "TrichromeLibrary",
-    product_specific: true,
-    compile_multilib: "both",
-    certificate: "platform",
-    arch: {
-        arm: {
-            apk: "arm/TrichromeLibrary.apk",
-        },
-        arm64: {
-            apk: "arm64/TrichromeLibrary.apk",
-        },
-        x86: {
-            apk: "x86/TrichromeLibrary.apk",
-        },
-        x86_64: {
-            apk: "x64/TrichromeLibrary.apk",
-        },
-    },
-    dex_preopt: {
-        enabled: false,
-    },
-}
-
-android_app_import {
-    name: "BrowserWebView",
-    product_specific: true,
-    compile_multilib: "both",
-    certificate: "platform",
-    required: [
-        "libwebviewchromium_loader",
-        "libwebviewchromium_plat_support",
-        "TrichromeLibrary",
-    ],
-    arch: {
-        arm: {
-            apk: "arm/TrichromeWebView.apk",
-        },
-        arm64: {
-            apk: "arm64/TrichromeWebView.apk",
-        },
-        x86: {
-            apk: "x86/TrichromeWebView.apk",
-        },
-        x86_64: {
-            apk: "x64/TrichromeWebView.apk",
-        },
-    },
-    optional_uses_libs: ["androidx.window.extensions"],
-    overrides: ["webview"],
-    dex_preopt: {
-        enabled: false,
-    },
-}
diff --git a/Browser/Android.mk b/Browser/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..c698df44718a0bef59a9fd410caec135b3812357
--- /dev/null
+++ b/Browser/Android.mk
@@ -0,0 +1,68 @@
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64))
+    APK_PATH := arm64
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm))
+    APK_PATH := arm
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86_64))
+    APK_PATH := x64
+else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86))
+    APK_PATH := x86
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Browser
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MULTILIB := both
+ifneq (,$(wildcard user-keys/platform.x509.pem))
+LOCAL_CERTIFICATE := user-keys/platform
+else
+LOCAL_CERTIFICATE := platform
+endif
+LOCAL_REQUIRED_MODULES := \
+        TrichromeLibrary
+LOCAL_SRC_FILES := $(APK_PATH)/TrichromeChrome.apk
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar
+endif
+LOCAL_OVERRIDES_PACKAGES := Jelly Browser2 QuickSearchBox
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TrichromeLibrary
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MULTILIB := both
+ifneq (,$(wildcard user-keys/platform.x509.pem))
+LOCAL_CERTIFICATE := user-keys/platform
+else
+LOCAL_CERTIFICATE := platform
+endif
+LOCAL_SRC_FILES := $(APK_PATH)/TrichromeLibrary.apk
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := BrowserWebView
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_MULTILIB := both
+ifneq (,$(wildcard user-keys/platform.x509.pem))
+LOCAL_CERTIFICATE := user-keys/platform
+else
+LOCAL_CERTIFICATE := platform
+endif
+LOCAL_REQUIRED_MODULES := \
+        libwebviewchromium_loader \
+        libwebviewchromium_plat_support
+LOCAL_REQUIRED_MODULES += \
+        TrichromeLibrary
+LOCAL_SRC_FILES := $(APK_PATH)/TrichromeWebView.apk
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions
+endif
+LOCAL_OVERRIDES_PACKAGES := webview
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
diff --git a/Mail/Android.bp b/Mail/Android.bp
deleted file mode 100644
index 616262f0e898f7dc48b6847256d41a3e30681398..0000000000000000000000000000000000000000
--- a/Mail/Android.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-android_app_import {
-    name: "Mail",
-    overrides: ["Email"],
-    certificate: "platform",
-    optional_uses_libs: [
-        "com.sec.android.app.multiwindow",
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-    ],
-    apk: "k9mail-release-unsigned.apk",
-}
diff --git a/Mail/Android.mk b/Mail/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..3b3d654d70ff79e75f6f6dcd69a5ec2f1f2382a6
--- /dev/null
+++ b/Mail/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := Mail
+LOCAL_OVERRIDES_PACKAGES := Email
+LOCAL_CERTIFICATE := platform
+LOCAL_SRC_FILES := k9mail-release-unsigned.apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := com.sec.android.app.multiwindow \
+                                 androidx.window.extensions \
+                                 androidx.window.sidecar
+endif
+include $(BUILD_PREBUILT)
diff --git a/Maps/Android.bp b/Maps/Android.bp
deleted file mode 100644
index 1fc3c599b71469b46a2d9686c14785a408ed1fcc..0000000000000000000000000000000000000000
--- a/Maps/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-android_app_import {
-    name: "Maps",
-    presigned: true,
-    preprocessed: true,
-
-    required: [
-        "mapsOverlay",
-    ],
-
-    optional_uses_libs: [
-        "com.sec.android.app.multiwindow",
-        "org.apache.http.legacy",
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-    ],
-    arch: {
-        arm: {
-            apk: "Maps-arm.apk",
-        },
-        arm64: {
-            apk: "Maps-arm64.apk",
-        },
-        x86: {
-            apk: "Maps-x86.apk",
-        },
-        x86_64: {
-            apk: "Maps-x86_64.apk",
-        },
-    },
-}
diff --git a/Maps/Android.mk b/Maps/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..029f965c3747cb20aeb9bd54de7cf3631dc87537
--- /dev/null
+++ b/Maps/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := Maps
+LOCAL_SRC_FILES := Maps-$(TARGET_ARCH).apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_REQUIRED_MODULES := mapsOverlay
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := com.sec.android.app.multiwindow org.apache.http.legacy androidx.window.extensions androidx.window.sidecar
+endif
+include $(BUILD_PREBUILT)
diff --git a/OpenKeychain/Android.bp b/OpenKeychain/Android.bp
deleted file mode 100644
index 0444bbd5a37fd2e3975b4fc7617c01b85fe68be9..0000000000000000000000000000000000000000
--- a/OpenKeychain/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-android_app_import {
-    name: "OpenKeychain",
-    apk: "org.sufficientlysecure.keychain_60400.apk",
-    presigned: true,
-    preprocessed: true,
-}
diff --git a/OpenKeychain/Android.mk b/OpenKeychain/Android.mk
new file mode 100644
index 0000000000000000000000000000000000000000..c98dd5c5f53f92bd8315ecbd2e62bde2bc438670
--- /dev/null
+++ b/OpenKeychain/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := OpenKeychain
+LOCAL_SRC_FILES := org.sufficientlysecure.keychain_60400.apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_CERTIFICATE := PRESIGNED
+include $(BUILD_PREBUILT)
diff --git a/config/common.mk b/config/common.mk
index c436a1e10ed1e882fb4b6c83bbbce4c306a6853f..a20783d00f7cd80a2c1f98cc8c76edcfb615754f 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -21,6 +21,7 @@ PRODUCT_PACKAGES += \
     AppLounge \
     BlissWeather \
     Browser \
+    BrowserWebView \
     Camera \
     eCalendar \
     eDrive \