Merge RP1A.200106.001

Change-Id: Ic6f6d461647c465f335d119424b17fb3926f6f39
diff --git a/Android.bp b/Android.bp
index 398e957..e909fd2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,6 +33,10 @@
         "//art/build/apex",
         "//libcore",
     ],
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
     srcs: ["src/main/java/**/*.java"],
     java_resource_dirs: ["src/main/java"],