diff --git a/AccountManager/Android.bp b/AccountManager/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..1f2a9c60afaf77cc6f84772ebdd355947284ae9e
--- /dev/null
+++ b/AccountManager/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "AccountManager",
+    certificate: "platform",
+    apk: "app-standard-release-unsigned.apk",
+}
diff --git a/AccountManager/Android.mk b/AccountManager/Android.mk
deleted file mode 100644
index 68d4d70afa9663d236966982c3668c688c11d1da..0000000000000000000000000000000000000000
--- a/AccountManager/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := AccountManager
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := app-standard-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/Apps/Android.bp b/Apps/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..1f91e40cea06a47b255c02e74c44a96b2b002b46
--- /dev/null
+++ b/Apps/Android.bp
@@ -0,0 +1,6 @@
+android_app_import {
+    name: "Apps",
+    certificate: "platform",
+    apk: "AppLounge-2.3.4-release.apk",
+    optional_uses_libs: ["androidx.window.extensions", "androidx.window.sidecar"],
+}
diff --git a/Apps/Android.mk b/Apps/Android.mk
deleted file mode 100644
index f0fd1ea430da52a60bae45ef4ab1b003d277b1ec..0000000000000000000000000000000000000000
--- a/Apps/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Apps
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := AppLounge-2.3.6-release.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 := androidx.window.extensions \
-                                 androidx.window.sidecar
-endif
-include $(BUILD_PREBUILT)
diff --git a/BlissIconPack/Android.bp b/BlissIconPack/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..8c630b23593be332c1b1193e85364c810f4999c8
--- /dev/null
+++ b/BlissIconPack/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "BlissIconPack",
+    certificate: "platform",
+    apk: "app-release-unsigned.apk",
+}
diff --git a/BlissIconPack/Android.mk b/BlissIconPack/Android.mk
deleted file mode 100644
index ed238a48dcc19cd69fd7f407e6e774211cf75fdc..0000000000000000000000000000000000000000
--- a/BlissIconPack/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := BlissIconPack
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := app-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/Calendar/Android.bp b/Calendar/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..8675bdb18d030113301fe333ea0666b89843d1b8
--- /dev/null
+++ b/Calendar/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "Calendar",
+    certificate: "platform",
+    apk: "calendar-release-unsigned.apk",
+}
diff --git a/Calendar/Android.mk b/Calendar/Android.mk
deleted file mode 100644
index a0dcc26f34545df9357e3d819b39780bfdfce2e4..0000000000000000000000000000000000000000
--- a/Calendar/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Calendar
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := calendar-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/Camera/Android.bp b/Camera/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..105369447c2f5bc9122328d50f596c0128f372e2
--- /dev/null
+++ b/Camera/Android.bp
@@ -0,0 +1,9 @@
+android_app_import {
+    name: "Camera",
+    certificate: "platform",
+    overrides: [
+        "Camera2",
+        "Snap",
+    ],
+    apk: "app-release-unsigned.apk",
+}
diff --git a/Camera/Android.mk b/Camera/Android.mk
deleted file mode 100644
index a447261e17ad4d2c19f24361bafd6ebd63b6dc06..0000000000000000000000000000000000000000
--- a/Camera/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Camera
-LOCAL_SRC_FILES := app-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := Camera2 Snap
-include $(BUILD_PREBUILT)
diff --git a/DemoApp/Android.bp b/DemoApp/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..7b4e2bb42dafcc18ce0ad52fa3bb92bc5fc11218
--- /dev/null
+++ b/DemoApp/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "DemoApp",
+    certificate: "platform",
+    apk: "DemoApp-release-unsigned.apk",
+}
diff --git a/DemoApp/Android.mk b/DemoApp/Android.mk
deleted file mode 100644
index 700a46f604c39527e50e012b85b6371d0a8ce066..0000000000000000000000000000000000000000
--- a/DemoApp/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := DemoApp
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := DemoApp-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/DroidGuard/Android.bp b/DroidGuard/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..9b79e04cef17bca43986990dfbb135450909d008
--- /dev/null
+++ b/DroidGuard/Android.bp
@@ -0,0 +1,6 @@
+android_app_import {
+    name: "DroidGuard",
+    privileged: true,
+    certificate: "shared",
+    apk: "remote-droid-guard-release-unsigned.apk",
+}
diff --git a/DroidGuard/Android.mk b/DroidGuard/Android.mk
deleted file mode 100644
index 3e1f978b388d612e96b1a5dee81840e7b75f76e7..0000000000000000000000000000000000000000
--- a/DroidGuard/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := DroidGuard
-LOCAL_SRC_FILES := remote-droid-guard-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := shared
-include $(BUILD_PREBUILT)
diff --git a/ESmsSync/Android.bp b/ESmsSync/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..5c69a158089756b067f3e8a2dc0341837a3cbac6
--- /dev/null
+++ b/ESmsSync/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "ESmsSync",
+    certificate: "platform",
+    apk: "ncsms-android-release-unsigned.apk",
+}
diff --git a/ESmsSync/Android.mk b/ESmsSync/Android.mk
deleted file mode 100644
index b8df9dae4b81cb9a8115cd209b70e5096cc2d933..0000000000000000000000000000000000000000
--- a/ESmsSync/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := ESmsSync
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := ncsms-android-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/FakeStore/Android.bp b/FakeStore/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..ad5cba571ddc224eba523e8bdce81f9edd6a819f
--- /dev/null
+++ b/FakeStore/Android.bp
@@ -0,0 +1,13 @@
+prebuilt_etc {
+    name: "privapp-permissions-com.android.vending.xml",
+    src: "privapp-permissions-com.android.vending.xml",
+    sub_dir: "permissions",
+
+}
+android_app_import {
+    name: "FakeStore",
+    privileged: true,
+    certificate: "platform",
+    required: ["privapp-permissions-com.android.vending.xml"],
+    apk: "com.android.vending-22.apk",
+}
diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
deleted file mode 100644
index 6833a658a6ba5efb02d64a339a9cad1fd875176d..0000000000000000000000000000000000000000
--- a/FakeStore/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := privapp-permissions-com.android.vending.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := FakeStore
-LOCAL_SRC_FILES := com.android.vending-22.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := platform
-LOCAL_REQUIRED_MODULES := privapp-permissions-com.android.vending.xml
-include $(BUILD_PREBUILT)
-
diff --git a/GmsCore/Android.bp b/GmsCore/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..d4ff5d8c9e71adfbfa06f12abda29c3f7e83b243
--- /dev/null
+++ b/GmsCore/Android.bp
@@ -0,0 +1,18 @@
+prebuilt_etc {
+    name: "privapp-permissions-com.google.android.gms.xml",
+    src: "privapp-permissions-com.google.android.gms.xml",
+    sub_dir: "permissions",
+}
+prebuilt_etc {
+    name: "microg.xml",
+    src: "GmsCore/microg.xml",
+}
+android_app_import {
+    name: "GmsCore",
+    privileged: true,
+    certificate: "platform",
+    overrides: ["com.qualcomm.location"],
+    required: ["privapp-permissions-com.google.android.gms.xml", "microg.xml"],
+    apk: "play-services-core-withMapbox-withoutNearby-release-unsigned.apk",
+    uses_libs: ["com.android.location.provider"],
+}
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
deleted file mode 100644
index 2698c93b4e2c512f8fd0afda82272f885227ac03..0000000000000000000000000000000000000000
--- a/GmsCore/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := privapp-permissions-com.google.android.gms.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := microg.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
-LOCAL_SRC_FILES := microg.xml
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := GmsCore
-LOCAL_SRC_FILES := play-services-core-withMapbox-withoutNearby-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location
-LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml
-LOCAL_REQUIRED_MODULES += microg.xml
-ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
-LOCAL_USES_LIBRARIES := com.android.location.provider
-endif
-include $(BUILD_PREBUILT)
diff --git a/GsfProxy/Android.bp b/GsfProxy/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..40ce76f5c8478c7181d23022c2862664cf0841f7
--- /dev/null
+++ b/GsfProxy/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "GsfProxy",
+    apk: "com.google.android.gsf-8.apk",
+    presigned: true,
+}
diff --git a/GsfProxy/Android.mk b/GsfProxy/Android.mk
deleted file mode 100644
index c200fc41a10d79788721d655e1efcbbec236bb82..0000000000000000000000000000000000000000
--- a/GsfProxy/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := GsfProxy
-LOCAL_SRC_FILES := com.google.android.gsf-8.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/LibreOfficeViewer/Android.bp b/LibreOfficeViewer/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..21317acdbe79d32c436f03567323ee3b508af359
--- /dev/null
+++ b/LibreOfficeViewer/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "LibreOfficeViewer",
+    apk: "org.documentfoundation.libreoffice_15.apk",
+    presigned: true,
+}
diff --git a/LibreOfficeViewer/Android.mk b/LibreOfficeViewer/Android.mk
deleted file mode 100644
index 7f09acfc8c79695c59af790588955c42df72a762..0000000000000000000000000000000000000000
--- a/LibreOfficeViewer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := LibreOfficeViewer
-LOCAL_SRC_FILES := org.documentfoundation.libreoffice_15.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/Light/Android.bp b/Light/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..844c2769e88b0184b492dae0e3f5f9677745264c
--- /dev/null
+++ b/Light/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "Light",
+    certificate: "platform",
+    apk: "light-release-unsigned.apk",
+}
diff --git a/Light/Android.mk b/Light/Android.mk
deleted file mode 100644
index 142d49b065baef7d21b7dbab9974fde33dbe15b4..0000000000000000000000000000000000000000
--- a/Light/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Light
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := light-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/Mail/Android.bp b/Mail/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..b45036e347cc251269c12e449037278ae2f57e1e
--- /dev/null
+++ b/Mail/Android.bp
@@ -0,0 +1,7 @@
+android_app_import {
+    name: "Mail",
+    overrides: ["Email"],
+    certificate: "platform",
+    apk: "k9mail-release-unsigned.apk",
+    optional_uses_libs: ["com.sec.android.app.multiwindow", "androidx.window.extensions", "androidx.window.sidecar"],
+}
diff --git a/Mail/Android.mk b/Mail/Android.mk
deleted file mode 100644
index 3b3d654d70ff79e75f6f6dcd69a5ec2f1f2382a6..0000000000000000000000000000000000000000
--- a/Mail/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-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/Message/Android.bp b/Message/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..af41eab683c2466496427b6d19672d420dcedf42
--- /dev/null
+++ b/Message/Android.bp
@@ -0,0 +1,6 @@
+android_app_import {
+    name: "Message",
+    certificate: "platform",
+    overrides: ["messaging"],
+    apk: "presentation-noAnalytics-universal-release-unsigned.apk",
+}
diff --git a/Message/Android.mk b/Message/Android.mk
deleted file mode 100644
index 37210e83cb30c89713b9805dc3652f905001b549..0000000000000000000000000000000000000000
--- a/Message/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Message
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := messaging
-LOCAL_SRC_FILES := presentation-noAnalytics-universal-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/MozillaNlpBackend/Android.bp b/MozillaNlpBackend/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..a3714ecb75d7ab2845311e2f9ca53702f8a900a0
--- /dev/null
+++ b/MozillaNlpBackend/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "MozillaNlpBackend",
+    apk: "IchnaeaNlpBackend-1.5.apk",
+    presigned: true,
+}
diff --git a/MozillaNlpBackend/Android.mk b/MozillaNlpBackend/Android.mk
deleted file mode 100644
index 62e4bc68b7d06d4da2b6a7130b62ddd5f263c526..0000000000000000000000000000000000000000
--- a/MozillaNlpBackend/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := MozillaNlpBackend
-LOCAL_SRC_FILES := IchnaeaNlpBackend-1.5.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/NominatimNlpBackend/Android.bp b/NominatimNlpBackend/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..5b381a9ebda5196b183623ae82fea93093446786
--- /dev/null
+++ b/NominatimNlpBackend/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "NominatimNlpBackend",
+    apk: "org.microg.nlp.backend.nominatim_20042.apk",
+    presigned: true,
+}
diff --git a/NominatimNlpBackend/Android.mk b/NominatimNlpBackend/Android.mk
deleted file mode 100644
index 47a0075f0ff454e2685490a7ed758b3e64ce1845..0000000000000000000000000000000000000000
--- a/NominatimNlpBackend/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := NominatimNlpBackend
-LOCAL_SRC_FILES := org.microg.nlp.backend.nominatim_20042.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/Notes/Android.bp b/Notes/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..52ec9306c59f6370a9fa3980d2e37da39ac77345
--- /dev/null
+++ b/Notes/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "Notes",
+    certificate: "platform",
+    apk: "app-release-unsigned.apk",
+}
diff --git a/Notes/Android.mk b/Notes/Android.mk
deleted file mode 100644
index d497a2d58af5c48f5c1cd8bbebbb1b88aa2385d8..0000000000000000000000000000000000000000
--- a/Notes/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Notes
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := app-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/OpenKeychain/Android.bp b/OpenKeychain/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..74ec842dfcbca18d329e98778cfd77ead6ecaada
--- /dev/null
+++ b/OpenKeychain/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "OpenKeychain",
+    apk: "org.sufficientlysecure.keychain_57500.apk",
+    presigned: true,
+}
diff --git a/OpenKeychain/Android.mk b/OpenKeychain/Android.mk
deleted file mode 100644
index 45e77634363ab32e3227cfd4ea723c23734ceba3..0000000000000000000000000000000000000000
--- a/OpenKeychain/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := OpenKeychain
-LOCAL_SRC_FILES := org.sufficientlysecure.keychain_57500.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/PdfViewer/Android.bp b/PdfViewer/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..f344daceab5c1d7c6fa21f1433e0e9a8f0d19f21
--- /dev/null
+++ b/PdfViewer/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "PdfViewer",
+    certificate: "platform",
+    apk: "app-release-unsigned.apk",
+}
diff --git a/PdfViewer/Android.mk b/PdfViewer/Android.mk
deleted file mode 100644
index ae5990ac07ec3a0f2eedbccd23efa198c56f7940..0000000000000000000000000000000000000000
--- a/PdfViewer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := PdfViewer
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := app-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/PwaPlayer/Android.bp b/PwaPlayer/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..0076cd40e2fe95244dabfeacf61826795c91c41b
--- /dev/null
+++ b/PwaPlayer/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "PwaPlayer",
+    certificate: "platform",
+    apk: "app-release-unsigned.apk",
+}
diff --git a/PwaPlayer/Android.mk b/PwaPlayer/Android.mk
deleted file mode 100644
index bb8821731d6b39593fe96437cddbf0a2d295c703..0000000000000000000000000000000000000000
--- a/PwaPlayer/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := PwaPlayer
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := app-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/SeedVault/Android.bp b/SeedVault/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..2142532877359c95b071310bb73026c5ea50a6a8
--- /dev/null
+++ b/SeedVault/Android.bp
@@ -0,0 +1,13 @@
+prebuilt_etc {
+    name: "privapp-permissions-com.stevesoltys.seedvault.xml",
+    src: "privapp-permissions-com.stevesoltys.seedvault.xml",
+    sub_dir: "permissions",
+}
+android_app_import {
+    name: "SeedVault",
+    certificate: "platform",
+    privileged: true,
+    required: ["privapp-permissions-com.stevesoltys.seedvault.xml"],
+    apk: "SeedVault.apk",
+
+}
diff --git a/SeedVault/Android.mk b/SeedVault/Android.mk
deleted file mode 100644
index a5ec372cc9e22a8c9adc724f5134982135f5980b..0000000000000000000000000000000000000000
--- a/SeedVault/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := privapp-permissions-com.stevesoltys.seedvault.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := SeedVault
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := SeedVault.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_REQUIRED_MODULES := privapp-permissions-com.stevesoltys.seedvault.xml
-include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/Tasks/Android.bp b/Tasks/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..78ddd61e6e12446b843b4f7d8142e08fc2a115a0
--- /dev/null
+++ b/Tasks/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "Tasks",
+    certificate: "platform",
+    apk: "opentasks-release-unsigned.apk",
+}
diff --git a/Tasks/Android.mk b/Tasks/Android.mk
deleted file mode 100644
index 188c98d85e70244ce1f41cc5fbafd628f7beef58..0000000000000000000000000000000000000000
--- a/Tasks/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Tasks
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := opentasks-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/eDrive/Android.bp b/eDrive/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..84db3c0f3cb2e617adc5c8da02da7a519dc5a36a
--- /dev/null
+++ b/eDrive/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "eDrive",
+    certificate: "platform",
+    apk: "eDrive-1.1.0-release-unsigned.apk",
+}
diff --git a/eDrive/Android.mk b/eDrive/Android.mk
deleted file mode 100644
index 3977b9ef8e60cc6536e40be62f145f8a00706db5..0000000000000000000000000000000000000000
--- a/eDrive/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := eDrive
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := eDrive-1.2.2-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/eSpeakTTS/Android.bp b/eSpeakTTS/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..06fa5a481279a2c0f80ca501c7f9b12bcd5b2847
--- /dev/null
+++ b/eSpeakTTS/Android.bp
@@ -0,0 +1,5 @@
+android_app_import {
+    name: "eSpeakTTS",
+    certificate: "platform",
+    apk: "espeak-release-unsigned.apk",
+}
diff --git a/eSpeakTTS/Android.mk b/eSpeakTTS/Android.mk
deleted file mode 100644
index 3813202adff7e07685d77a2a2537697b3e7fba4e..0000000000000000000000000000000000000000
--- a/eSpeakTTS/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := eSpeakTTS
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := espeak-release-unsigned.apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)