diff --git a/apps/Android.mk b/apps/Android.mk
index 93eed50..5f3df66 100644
--- a/apps/Android.mk
+++ b/apps/Android.mk
@@ -166,5 +166,5 @@ LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_DEX_PREOPT := false
 LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk
 LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy
+LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy androidx.window.extensions androidx.window.sidecar
 include $(BUILD_PREBUILT)
diff --git a/sounds/Android.bp b/sounds/Android.bp
new file mode 100644
index 0000000..9a73c50
--- /dev/null
+++ b/sounds/Android.bp
@@ -0,0 +1,10 @@
+android_app_import {
+        name: "SoundPickerPrebuilt",
+        owner: "google",
+        apk: "SoundPickerPrebuilt.apk",
+        presigned: true,
+        dex_preopt: {
+                enabled: false,
+        },
+        product_specific: true,
+}
diff --git a/sounds/Android.mk b/sounds/Android.mk
deleted file mode 100644
index 53174e2..0000000
--- a/sounds/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SoundPickerPrebuilt
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-include $(BUILD_PREBUILT)