Snap for 11869550 from 8a9d121f1d223c505d8e7fa9ca64e5d2117186b8 to 24Q3-release

Change-Id: Ie9f095f15598532b5588de9547f3600c0523b18a

Android.bp

diff --git a/Android.bp b/Android.bp
index c6d0cdb..e46f0c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
     crate_name: "merge",
     cargo_env_compat: true,
     cargo_pkg_version: "0.1.0",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     edition: "2018",
     features: [
         "default",