diff --git a/BUILD b/BUILD
index bb1e5f0..ea0af15 100644
--- a/BUILD
+++ b/BUILD
@@ -1,9 +1,13 @@
-load("@rules_android//rules:rules.bzl", "android_binary", "android_library")
+load("//build/bazel/rules/android:rules.bzl", "android_binary")
 
 android_binary(
     name = "Music",
     srcs = glob(["src/**/*.java"]),
     custom_package = "com.android.music",
     manifest = "AndroidManifest.xml",
-    deps = ["//packages/apps/Music/kotlin:MusicResources"],
+    # TODO(b/179889880): this manual BUILD file exists because these resources,
+    # if listed as files, would cross package boundary.
+    resource_files = ["//packages/apps/Music/kotlin:MusicResourceFiles"],
+    sdk_version = "current",
+    target_compatible_with = ["//build/bazel/platforms/os:android"],
 )
diff --git a/kotlin/BUILD b/kotlin/BUILD
index ab0691c..40c96d3 100644
--- a/kotlin/BUILD
+++ b/kotlin/BUILD
@@ -1,31 +1,4 @@
-load("@rules_android//rules:rules.bzl", "android_binary", "android_library")
-
-# Placeholder manifest is required to build the android library below.
-genrule(
-    name = "gen_placeholdermanifest",
-    outs = ["AndroidManifest.xml"],
-    cmd = """
-echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.Music"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="21" />
-</manifest>
-
-' > $@""",
-)
-
-# Workaround a bug where including resources at the top-level android_binary fails,
-# it seems due to the resource folder being nested. Instead, we create this
-# library to hold the resources and make the android_binary target depend on it.
-android_library(
-    name = "MusicResources",
-    srcs = [],
-    custom_package = "com.android.music",
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    visibility = ["//visibility:public"],
+filegroup(
+    name = "MusicResourceFiles",
+    srcs = glob(["res/**"]),
 )