Snap for 6948038 from 5f4716532293989a2489ee6b11075745f2b7a6cb to rvc-platform-releaseandroid-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android11-platform-release

Change-Id: Ia51341f87192c30ff9d36fa97f5f849280e67d6c

44 files changed, 166 insertions, 155 deletions

diff --git a/29/public/android.car.jar b/29/public/android.car.jar
new file mode 100644
index 000000000..6ccac07ca
--- /dev/null
+++ b/29/public/android.car.jar
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar
index 6e4200a20..d1e10d4c1 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.md5 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.md5
index e586568b8..ec2f2ca52 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.md5
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.md5
@@ -1 +1 @@
-6c96b531bd66ea049fe2a690d4a2b9e0
\ No newline at end of file
+d399fb997d0152cfd4dd3502e72b8e61
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha1 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha1
index c99789bd9..6fc5e4fcd 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha1
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha1
@@ -1 +1 @@
-91a0ef6eb38cd662ca013cd729ad621b9d6e8750
\ No newline at end of file
+2c4944f6131b01bcc1029705ada7e745a74fb23d
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha256 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha256
index 248af331f..defa6f6b4 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha256
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha256
@@ -1 +1 @@
-40958ecfe5ea333a300269059c8b850c1edf00d2637a34f37e4bad5e1b91c71c
\ No newline at end of file
+5519f30d1e51d1d9ecab2f4bf9ef5c3b17ef566c1c34e8333f1736db272ed4da
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha512 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha512
index be6eb8634..ef1e56a8e 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha512
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04-sources.jar.sha512
@@ -1 +1 @@
-46d2d68c0cbfd4253ecdccc441d68247fa03a1dcf65a14985dfe6929a6a26be4fb33cd83a3e968df879f76d14785f977887d609d454e1b1bac0c217a98f071f5
\ No newline at end of file
+a3a85395a62dfe855be554d0e963bd7162708162d2b99c0c74d3bb4652857c3110739379a121d6c9b99e5321caa1c3e17ba9b1cd227b965e1cf178cdb613e5a6
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar
index 5da5115b2..4c3ad9048 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.md5 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.md5
index 0edf7eb5c..7b9827cee 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.md5
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.md5
@@ -1 +1 @@
-92ccfd7f6eb314df3b6a8b51a5e7fb31
\ No newline at end of file
+f2dca780d00db5446dacf730c9096444
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha1 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha1
index 8398cc247..e509eb601 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha1
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha1
@@ -1 +1 @@
-3895a3d853f2d727cb46ca3d98511eb0d9e72e5f
\ No newline at end of file
+792e9ca65158230df9446a387594818a3c301f07
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha256 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha256
index a2c689d30..781cf3aab 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha256
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha256
@@ -1 +1 @@
-3b07cfb6be7616338aa97b05974528d4832a7b4e70a4bb44b2551f7486d248ce
\ No newline at end of file
+eb8ed60cb3d3f5484f4f6ca91cea49dee31f4496a9cde81def0e6f75a15f9453
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha512 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha512
index 22735e82c..f44f40c88 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha512
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.aar.sha512
@@ -1 +1 @@
-75ebe301272ba5147168a76583f67b98ba40c47bd0f46fe63e2afad9a862241b810d899492c3c5b307a9932c7e9d16b5d8ff4a24843db0004cf48737f71f0283
\ No newline at end of file
+50bcd16e5a1b71d29293734cbd4b5d2fb140a779edfb8d77202e8df10361e8c730ab8e508d8166a260fb1ab7c1e47a9e83939610f2adc5884e2d263ab1c3e330
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module
index 83a9a07c7..558021598 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module
@@ -10,8 +10,8 @@
   },
   "createdBy": {
     "gradle": {
-      "version": "6.5",
-      "buildId:": "6616358"
+      "version": "6.5.1",
+      "buildId:": "6791305"
     }
   },
   "variants": [
@@ -36,11 +36,11 @@
         {
           "name": "dynamicanimation-1.1.0-alpha04.aar",
           "url": "dynamicanimation-1.1.0-alpha04.aar",
-          "size": 32408,
-          "sha512": "75ebe301272ba5147168a76583f67b98ba40c47bd0f46fe63e2afad9a862241b810d899492c3c5b307a9932c7e9d16b5d8ff4a24843db0004cf48737f71f0283",
-          "sha256": "3b07cfb6be7616338aa97b05974528d4832a7b4e70a4bb44b2551f7486d248ce",
-          "sha1": "3895a3d853f2d727cb46ca3d98511eb0d9e72e5f",
-          "md5": "92ccfd7f6eb314df3b6a8b51a5e7fb31"
+          "size": 32991,
+          "sha512": "50bcd16e5a1b71d29293734cbd4b5d2fb140a779edfb8d77202e8df10361e8c730ab8e508d8166a260fb1ab7c1e47a9e83939610f2adc5884e2d263ab1c3e330",
+          "sha256": "eb8ed60cb3d3f5484f4f6ca91cea49dee31f4496a9cde81def0e6f75a15f9453",
+          "sha1": "792e9ca65158230df9446a387594818a3c301f07",
+          "md5": "f2dca780d00db5446dacf730c9096444"
         }
       ]
     },
@@ -72,11 +72,11 @@
         {
           "name": "dynamicanimation-1.1.0-alpha04.aar",
           "url": "dynamicanimation-1.1.0-alpha04.aar",
-          "size": 32408,
-          "sha512": "75ebe301272ba5147168a76583f67b98ba40c47bd0f46fe63e2afad9a862241b810d899492c3c5b307a9932c7e9d16b5d8ff4a24843db0004cf48737f71f0283",
-          "sha256": "3b07cfb6be7616338aa97b05974528d4832a7b4e70a4bb44b2551f7486d248ce",
-          "sha1": "3895a3d853f2d727cb46ca3d98511eb0d9e72e5f",
-          "md5": "92ccfd7f6eb314df3b6a8b51a5e7fb31"
+          "size": 32991,
+          "sha512": "50bcd16e5a1b71d29293734cbd4b5d2fb140a779edfb8d77202e8df10361e8c730ab8e508d8166a260fb1ab7c1e47a9e83939610f2adc5884e2d263ab1c3e330",
+          "sha256": "eb8ed60cb3d3f5484f4f6ca91cea49dee31f4496a9cde81def0e6f75a15f9453",
+          "sha1": "792e9ca65158230df9446a387594818a3c301f07",
+          "md5": "f2dca780d00db5446dacf730c9096444"
         }
       ]
     },
@@ -92,11 +92,11 @@
         {
           "name": "dynamicanimation-1.1.0-alpha04-sources.jar",
           "url": "dynamicanimation-1.1.0-alpha04-sources.jar",
-          "size": 23362,
-          "sha512": "46d2d68c0cbfd4253ecdccc441d68247fa03a1dcf65a14985dfe6929a6a26be4fb33cd83a3e968df879f76d14785f977887d609d454e1b1bac0c217a98f071f5",
-          "sha256": "40958ecfe5ea333a300269059c8b850c1edf00d2637a34f37e4bad5e1b91c71c",
-          "sha1": "91a0ef6eb38cd662ca013cd729ad621b9d6e8750",
-          "md5": "6c96b531bd66ea049fe2a690d4a2b9e0"
+          "size": 23644,
+          "sha512": "a3a85395a62dfe855be554d0e963bd7162708162d2b99c0c74d3bb4652857c3110739379a121d6c9b99e5321caa1c3e17ba9b1cd227b965e1cf178cdb613e5a6",
+          "sha256": "5519f30d1e51d1d9ecab2f4bf9ef5c3b17ef566c1c34e8333f1736db272ed4da",
+          "sha1": "2c4944f6131b01bcc1029705ada7e745a74fb23d",
+          "md5": "d399fb997d0152cfd4dd3502e72b8e61"
         }
       ]
     }
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.md5 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.md5
index 686715725..2d337c154 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.md5
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.md5
@@ -1 +1 @@
-6636edbd9341fe4363032eea42f11664
\ No newline at end of file
+36ccccaf19928f7d07c05281c4c6c4b8
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha1 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha1
index 98f7fd5e0..c1698c94d 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha1
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha1
@@ -1 +1 @@
-184e81a6a7b455ae770b7138f7c3f809e1b83251
\ No newline at end of file
+24c88122827331718029dec5f2fcdbde29ec81a8
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha256 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha256
index fc39d7ba8..1a9c2e2be 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha256
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha256
@@ -1 +1 @@
-2787f3fc73b217fe84990d6242ec4a07327cac6028ebafaf3095e26ed6bc0b43
\ No newline at end of file
+6b7947ca6c513e4c7fe86418ec3ab46465d6ced5a0fa96a83a3f56df10c94cbc
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha512 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha512
index 9634f5369..ff8fe5be1 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha512
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.module.sha512
@@ -1 +1 @@
-94d207de0d85e4bacd39a647aeb290d1de80a94a42e463989d879a29ba201e91e5ac684e65441bdc6ad81109ebde4973452bde575ea679dcb568f19b097835e7
\ No newline at end of file
+aa78df6ae2ef88a9934bad2fe059bfcb19d12485c9b25d947b6f68498b3e511bf3cc6dae290180591f4a76dcce66411a592e1c3876b64ed1ded27cea98529012
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom
index e94209b4c..761c8b473 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom
@@ -12,7 +12,7 @@
   <packaging>aar</packaging>
   <name>Android Support DynamicAnimation</name>
   <description>Physics-based animation in support library, where the animations are driven by physics force. You can use this Animation library to create smooth and realistic animations.</description>
-  <url>https://developer.android.com/jetpack/androidx</url>
+  <url>https://developer.android.com/jetpack/androidx/releases/dynamicanimation#1.1.0-alpha04</url>
   <inceptionYear>2017</inceptionYear>
   <licenses>
     <license>
@@ -28,7 +28,7 @@
   </developers>
   <scm>
     <connection>scm:git:https://android.googlesource.com/platform/frameworks/support</connection>
-    <url>http://source.android.com</url>
+    <url>https://cs.android.com/androidx/platform/frameworks/support</url>
   </scm>
   <dependencies>
     <dependency>
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.md5 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.md5
index 52b6fbfb9..b6818adcd 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.md5
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.md5
@@ -1 +1 @@
-2637a11e5248b53ac870a4900a960bab
\ No newline at end of file
+6d187f10b5f390ac09e9f976b7d00ee3
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha1 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha1
index 148a349da..28d5079ba 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha1
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha1
@@ -1 +1 @@
-a743bcc9b2b469cda43e20484d7e5c991dc662f6
\ No newline at end of file
+efbfeae9932077c29a2e0aa0bb2fbabaed824e8e
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha256 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha256
index 2fc402c89..7be4e8443 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha256
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha256
@@ -1 +1 @@
-ade677907db124e40f94c61b25363b6ea1b586ae70252816b8dae8c55468854f
\ No newline at end of file
+f3a0559813bd52048c4315f0d232c99f4c6082bdf5e6e01ca393b8ff950a09b2
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha512 b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha512
index 72fd70919..74e202b3e 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha512
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/dynamicanimation-1.1.0-alpha04.pom.sha512
@@ -1 +1 @@
-55b3f149af5d997acd7f26e5e747ac47410ee7dc4792813cdf069b6282d6e271e349a93b8a39f9bb2382fbb1b4713c2c717b1cb5955311cbf52eb033f8483bf7
\ No newline at end of file
+2532bca2d945ea4a9cca5a55469d311297ae6825275d15959595dce850f94c8634fc3938ee8b4117845fcee35ef6694a1b391a1b4102797801d9475cd16cd51a
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
index 1e095b19c..74e026c8e 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
index 11d67d449..a764eab87 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.md5
@@ -1 +1 @@
-b7f8cf3c82a9cd7287edf0592e992717
\ No newline at end of file
+227b70a075a54864f9db966b9da1ccfc
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
index 7cb5e1032..8d86d2a58 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha1
@@ -1 +1 @@
-a9ea6f2750e3cdaafb8bd701913fab63b8dd23b9
\ No newline at end of file
+aadeee9a0d9971136cc69b913129340b34022213
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
index ef26c21e1..db161a639 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha256
@@ -1 +1 @@
-d86e1d9b29b21dcefc66c2e66068d4691aae3557acc03d0e67ea6c087419d79c
\ No newline at end of file
+d25a9d350c81a5c5287c5902a9ccfc52f4f02f7a5394b0d2b9c0e985c23a51d7
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
index df698c133..3db724828 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01-sources.jar.sha512
@@ -1 +1 @@
-9cc302d52ed271b300c30dcf587b49dd953f2c8110068d409bdac70671ff5b3bf694367ff78406e4f5e137537e08cec055c60909e57a5aaa3cf937675a591e81
\ No newline at end of file
+2309cd5f17147f08be80e976fbca565d3c61889c71cf5135a20e2f1883976773925138563865f6d014a374df03239d0f07f5ee4fa347eaab20ca7fca9a25c4b9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
index 801972a42..b704840d3 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
index e6a5cd3c5..5eb576142 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.md5
@@ -1 +1 @@
-a336351e806cd2a4219855c968116728
\ No newline at end of file
+38d8748dec46d177a32bc4cd9e83c6e9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
index 671f6f76f..9a26c6853 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha1
@@ -1 +1 @@
-e9e032d3f18b141a002e8244219bb810ffabf832
\ No newline at end of file
+708137a04076b5d3215062486727168933a0354b
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
index aa84932ca..cef2a7b9e 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha256
@@ -1 +1 @@
-f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515
\ No newline at end of file
+4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
index de1302eac..c867dddd9 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.aar.sha512
@@ -1 +1 @@
-3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3
\ No newline at end of file
+5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
index 82f55384f..c9408738a 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module
@@ -10,8 +10,8 @@
   },
   "createdBy": {
     "gradle": {
-      "version": "6.5",
-      "buildId:": "6616358"
+      "version": "6.5.1",
+      "buildId:": "6762995"
     }
   },
   "variants": [
@@ -64,11 +64,11 @@
         {
           "name": "preference-1.2.0-alpha01.aar",
           "url": "preference-1.2.0-alpha01.aar",
-          "size": 252816,
-          "sha512": "3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3",
-          "sha256": "f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515",
-          "sha1": "e9e032d3f18b141a002e8244219bb810ffabf832",
-          "md5": "a336351e806cd2a4219855c968116728"
+          "size": 253521,
+          "sha512": "5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b",
+          "sha256": "4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766",
+          "sha1": "708137a04076b5d3215062486727168933a0354b",
+          "md5": "38d8748dec46d177a32bc4cd9e83c6e9"
         }
       ]
     },
@@ -128,11 +128,11 @@
         {
           "name": "preference-1.2.0-alpha01.aar",
           "url": "preference-1.2.0-alpha01.aar",
-          "size": 252816,
-          "sha512": "3a430628f9d469a4271e345c817d009d44e5dd6e8de57a8a81c565c1610a2b75496ca1e43e91e117b36666953028e777b6759efece4bd2d18ce86448b5d9dca3",
-          "sha256": "f94645fdb1301aef13220f66e7f603d161249aa2d082f4a6f190265994277515",
-          "sha1": "e9e032d3f18b141a002e8244219bb810ffabf832",
-          "md5": "a336351e806cd2a4219855c968116728"
+          "size": 253521,
+          "sha512": "5d3510b3d8cce354ae1b51de000db9d1358fe83539294a90b24bdda51dc565658e08b897a116d9ab9c4d9105740b9a6ed3a1ee0c8d0d02239ae144189372dd7b",
+          "sha256": "4a8d036f828cc1b0c81d171519803f8b21063580a633af77777fa9f797e0d766",
+          "sha1": "708137a04076b5d3215062486727168933a0354b",
+          "md5": "38d8748dec46d177a32bc4cd9e83c6e9"
         }
       ]
     },
@@ -148,11 +148,11 @@
         {
           "name": "preference-1.2.0-alpha01-sources.jar",
           "url": "preference-1.2.0-alpha01-sources.jar",
-          "size": 108348,
-          "sha512": "9cc302d52ed271b300c30dcf587b49dd953f2c8110068d409bdac70671ff5b3bf694367ff78406e4f5e137537e08cec055c60909e57a5aaa3cf937675a591e81",
-          "sha256": "d86e1d9b29b21dcefc66c2e66068d4691aae3557acc03d0e67ea6c087419d79c",
-          "sha1": "a9ea6f2750e3cdaafb8bd701913fab63b8dd23b9",
-          "md5": "b7f8cf3c82a9cd7287edf0592e992717"
+          "size": 108845,
+          "sha512": "2309cd5f17147f08be80e976fbca565d3c61889c71cf5135a20e2f1883976773925138563865f6d014a374df03239d0f07f5ee4fa347eaab20ca7fca9a25c4b9",
+          "sha256": "d25a9d350c81a5c5287c5902a9ccfc52f4f02f7a5394b0d2b9c0e985c23a51d7",
+          "sha1": "aadeee9a0d9971136cc69b913129340b34022213",
+          "md5": "227b70a075a54864f9db966b9da1ccfc"
         }
       ]
     }
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
index 5bb7b7fea..97a4c79aa 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.md5
@@ -1 +1 @@
-067a54971e35c9d3e01bcbe37dc54a0b
\ No newline at end of file
+256e5946a3d4c5a5ea2acfd288fe5ad4
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
index 112ff5b61..b79c33416 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha1
@@ -1 +1 @@
-740c821bba2074b765cc5105f2f2ee6f72832532
\ No newline at end of file
+54283b775a8e4903ee13090c2e7779f1750337d4
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
index b4244e387..13442d494 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha256
@@ -1 +1 @@
-f7e446eba5739f6a834cf7866b8b5d2f3e80c93b9d88e57ce2207b7e7e912365
\ No newline at end of file
+de21f67412dd6c4db1181fdbb6a9ba4a2f1716c240666e9d43df2810477f1636
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
index 8c86931df..efd39ae9e 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.module.sha512
@@ -1 +1 @@
-4f377a4414d506101de40358b77760c08ba41923bc1ea62c089c25921ed01904b0923ae65b9bf99f6d0f80190d64689216cf8b6d2b965613c3249a141dd98345
\ No newline at end of file
+40a9ba0693ba71b20c58e14f6e76bbaef2cfe597e3a2714084719d8fbf43be5bb0a9777a08178e8ab4db1edfea346fb293e4f764324c501d7228d30479a55774
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
index db093b0bd..d155bc9e7 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom
@@ -12,7 +12,7 @@
   <packaging>aar</packaging>
   <name>AndroidX Preference</name>
   <description>AndroidX Preference</description>
-  <url>https://developer.android.com/jetpack/androidx</url>
+  <url>https://developer.android.com/jetpack/androidx/releases/preference#1.2.0-alpha01</url>
   <inceptionYear>2015</inceptionYear>
   <licenses>
     <license>
@@ -28,7 +28,7 @@
   </developers>
   <scm>
     <connection>scm:git:https://android.googlesource.com/platform/frameworks/support</connection>
-    <url>http://source.android.com</url>
+    <url>https://cs.android.com/androidx/platform/frameworks/support</url>
   </scm>
   <dependencies>
     <dependency>
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
index 7a1f0578b..e51271449 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.md5
@@ -1 +1 @@
-3bc00e8802038be4dd3a04a69800787f
\ No newline at end of file
+e3ad5a12d4f22dbe163105bed8dc1cc9
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
index 208f3d15b..2ba12ee52 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha1
@@ -1 +1 @@
-0d83b3201c6b3ff10d368bc677f5b4b95767bac9
\ No newline at end of file
+15faf081b51284170911ff5fdb9b74fb207f43a6
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
index 0cb04f7f3..7c0d0fc7c 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha256
@@ -1 +1 @@
-918e9288e5d26dd70ad65e9bc6cb0af8e05dbc5ade9b3ce4d8e6c7a7a9816c2a
\ No newline at end of file
+1b4376f53edcc6ecfb33c721f5fbba3a5aa02031dcadbad2c908266567eb0233
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512 b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
index 729ad6304..6aa36c8b2 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
+++ b/current/androidx/m2repository/androidx/preference/preference/1.2.0-alpha01/preference-1.2.0-alpha01.pom.sha512
@@ -1 +1 @@
-1649ee5df10be7817808d113a93c758d992a586bf6b8c6a3f64b4aa3956b6febd1bdbe072c17d4f3fd6f26620ef2711b50893aaac9ef64b6ac03cd2e9e0b94d9
\ No newline at end of file
+8a8c59689aa2d70bf184e98d006eacc99d7acb1fdbface7f3f2ec76be61f1effdf2644f075b586784f7025ed5f1db2181e548131ac186a756779124386c58817
\ No newline at end of file
diff --git a/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml b/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
index e8b0bfeb3..b7740ec08 100644
--- a/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
+++ b/current/androidx/manifests/androidx.preference_preference/AndroidManifest.xml
@@ -19,6 +19,6 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="29" />
+        android:targetSdkVersion="30" />
 
 </manifest>
\ No newline at end of file
diff --git a/renderscript/Android.bp b/renderscript/Android.bp
new file mode 100644
index 000000000..42a2748c1
--- /dev/null
+++ b/renderscript/Android.bp
@@ -0,0 +1,95 @@
+//
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+//#################################
+cc_prebuilt_library_shared {
+    name: "librsjni",
+    sdk_version: "23",
+    arch: {
+        arm: {
+            srcs: ["lib/arm/librsjni.so"],
+        },
+        arm64: {
+            srcs: ["lib/arm64/librsjni.so"],
+        },
+        x86: {
+            srcs: ["lib/x86/librsjni.so"],
+        },
+        x86_64: {
+            srcs: ["lib/x86_64/librsjni.so"],
+        },
+    },
+}
+
+//#################################
+cc_prebuilt_library_shared {
+    name: "libRSSupport",
+    sdk_version: "23",
+    arch: {
+        arm: {
+            srcs: ["lib/arm/libRSSupport.so"],
+        },
+        arm64: {
+            srcs: ["lib/arm64/libRSSupport.so"],
+        },
+        x86: {
+            srcs: ["lib/x86/libRSSupport.so"],
+        },
+        x86_64: {
+            srcs: ["lib/x86_64/libRSSupport.so"],
+        },
+    },
+}
+
+//#################################
+cc_prebuilt_library_shared {
+    name: "libRSSupportIO",
+    sdk_version: "23",
+    arch: {
+        arm: {
+            srcs: ["lib/arm/libRSSupportIO.so"],
+        },
+        arm64: {
+            srcs: ["lib/arm64/libRSSupportIO.so"],
+        },
+        x86: {
+            srcs: ["lib/x86/libRSSupportIO.so"],
+        },
+        x86_64: {
+            srcs: ["lib/x86_64/libRSSupportIO.so"],
+        },
+    },
+}
+
+//#################################
+java_import {
+    name: "android-support-v8-renderscript",
+    jars: ["lib/javalib.jar"],
+
+    // 23 as specified at frameworks/rs/support/Android.mk
+    sdk_version: "23",
+}
+
+//#################################
+java_import {
+    name: "android-support-v8-renderscript-legacy",
+    jars: ["lib/javalib_legacy.jar"],
+
+    // 23 as specified at frameworks/rs/support/Android.mk
+    sdk_version: "23",
+}
+
+//#################################
diff --git a/renderscript/Android.mk b/renderscript/Android.mk
deleted file mode 100644
index fb4b043ae..000000000
--- a/renderscript/Android.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-ifneq (,$(TARGET_BUILD_APPS))
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := librsjni
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libRSSupport
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libRSSupportIO
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android-support-v8-renderscript
-LOCAL_SRC_FILES := lib/javalib.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .jar
-LOCAL_UNINSTALLABLE_MODULE := true
-# 23 as specified at frameworks/rs/support/Android.mk
-LOCAL_SDK_VERSION := 23
-
-include $(BUILD_PREBUILT)
-
-##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android-support-v8-renderscript-legacy
-LOCAL_SRC_FILES := lib/javalib_legacy.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .jar
-LOCAL_UNINSTALLABLE_MODULE := true
-# 23 as specified at frameworks/rs/support/Android.mk
-LOCAL_SDK_VERSION := 23
-
-include $(BUILD_PREBUILT)
-
-##################################
-
-endif # TARGET_BUILD_APPS