Merge r-mpr-2022-01-05

Change-Id: Ic4bd0db67d5aa341fb581e0479b6bf4e959936fb
diff --git a/Android.bp b/Android.bp
index 4741c58..fd632a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -124,4 +124,6 @@
         "30",
         "current",
     ],
+    imports_sdk_version: "none",
+    imports_compile_dex: true,
 }