diff --git a/Browser/Android.bp b/Browser/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..7e4020b555dcc4e24b234148a2c7f3e169ea67d0
--- /dev/null
+++ b/Browser/Android.bp
@@ -0,0 +1,23 @@
+android_app_import {
+    name: "Browser",
+    certificate: "platform",
+
+    overrides: ["Jelly"],
+
+    product_specific: true,
+
+    arch: {
+        arm: {
+            apk: "ChromePublic_arm.apk",
+        },
+        arm64: {
+            apk: "ChromePublic_arm64.apk",
+        },
+        x86: {
+            apk: "ChromePublic_x86.apk",
+        },
+        x86_64: {
+            apk: "ChromePublic_x86_64.apk",
+        },
+    },
+}
diff --git a/Browser/Android.mk b/Browser/Android.mk
deleted file mode 100644
index 26e4ca0f22c4488d79bb18c7f56fe3c4a425cade..0000000000000000000000000000000000000000
--- a/Browser/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Browser
-LOCAL_CERTIFICATE := platform
-LOCAL_MULTILIB := both
-LOCAL_OVERRIDES_PACKAGES := Jelly
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
-src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH))
-LOCAL_SRC_FILES := ChromePublic_$(src_arch).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/BrowserWebView/Android.bp b/BrowserWebView/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..82d98d4f4cb088ab9b4aad90afed3237cb17f99e
--- /dev/null
+++ b/BrowserWebView/Android.bp
@@ -0,0 +1,28 @@
+android_app_import {
+    name: "BrowserWebView",
+    certificate: "platform",
+
+    overrides: ["webview"],
+
+    product_specific: true,
+
+    required: [
+        "libwebviewchromium_loader",
+        "libwebviewchromium_plat_support",
+    ],
+
+    arch: {
+        arm: {
+            apk: "SystemWebView_arm.apk",
+        },
+        arm64: {
+            apk: "SystemWebView_arm64.apk",
+        },
+        x86: {
+            apk: "SystemWebView_x86.apk",
+        },
+        x86_64: {
+            apk: "SystemWebView_x86_64.apk",
+        }
+    }
+}
diff --git a/BrowserWebView/Android.mk b/BrowserWebView/Android.mk
deleted file mode 100644
index 3bd554f200a5371b7514f2767fdf90014636c74f..0000000000000000000000000000000000000000
--- a/BrowserWebView/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := BrowserWebView
-LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
-LOCAL_MULTILIB := both
-LOCAL_OVERRIDES_PACKAGES := webview
-LOCAL_REQUIRED_MODULES := \
-        libwebviewchromium_loader \
-        libwebviewchromium_plat_support
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
-src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH))
-LOCAL_SRC_FILES := SystemWebView_$(src_arch).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)