diff --git a/Android.bp b/Android.bp
index f2b9ad6e3501fbe4e5a2ccf6e49d8695c64e93d2..4cab210eb3e5062d766fadc16c355677a18cbf57 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,10 +28,10 @@ android_app {
         "kotlin-annotations",
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
-        "androidx-constraintlayout_constraintlayout",
-        "androidx.preference_preference",
-        "androidx.appcompat_appcompat",
-        "com.google.android.material_material",
+        "etar-lib-androidx-constraintlayout_constraintlayout",
+        "etar-lib-androidx.preference_preference",
+        "etar-lib-androidx.appcompat_appcompat",
+        "etar-lib-com.google.android.material_material",
         "elib",
     ],
 
diff --git a/libs/androidx.appcompat_appcompat-resources/Android.bp b/libs/androidx.appcompat_appcompat-resources/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..c7b8aeea26bc6790750a79b7ff6f97288110f2f0
--- /dev/null
+++ b/libs/androidx.appcompat_appcompat-resources/Android.bp
@@ -0,0 +1,29 @@
+android_library_import {
+    name: "etar-lib-androidx.appcompat_appcompat-resources-nodeps",
+    aars: ["appcompat-resources-1.3.1.aar"],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.vectordrawable_vectordrawable-animated",
+    ],
+}
+
+android_library {
+    name: "etar-lib-androidx.appcompat_appcompat-resources",
+    sdk_version: "current",
+    min_sdk_version: "14",
+    manifest: "AndroidManifest.xml",
+    static_libs: [
+        "etar-lib-androidx.appcompat_appcompat-resources-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.vectordrawable_vectordrawable-animated",
+    ],
+    java_version: "1.7",
+}
\ No newline at end of file
diff --git a/libs/androidx.appcompat_appcompat-resources/AndroidManifest.xml b/libs/androidx.appcompat_appcompat-resources/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f90108b2df1dd583fb2e435a50af3d6ed85143b
--- /dev/null
+++ b/libs/androidx.appcompat_appcompat-resources/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.appcompat.resources" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/androidx.appcompat_appcompat-resources/appcompat-resources-1.3.1.aar b/libs/androidx.appcompat_appcompat-resources/appcompat-resources-1.3.1.aar
new file mode 100644
index 0000000000000000000000000000000000000000..6aef40b366f68fd47b8ea1a40ec2bd02fa43876f
Binary files /dev/null and b/libs/androidx.appcompat_appcompat-resources/appcompat-resources-1.3.1.aar differ
diff --git a/libs/androidx.appcompat_appcompat/Android.bp b/libs/androidx.appcompat_appcompat/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..9a85cc46ac8b5f816f34e634f4e0061102d7efd8
--- /dev/null
+++ b/libs/androidx.appcompat_appcompat/Android.bp
@@ -0,0 +1,41 @@
+android_library_import {
+    name: "etar-lib-androidx.appcompat_appcompat-nodeps",
+    aars: ["appcompat-1.3.1.aar"],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.cursoradapter_cursoradapter",
+        "androidx.activity_activity",
+        "androidx.fragment_fragment",
+        "etar-lib-androidx.appcompat_appcompat-resources",
+        "androidx.drawerlayout_drawerlayout",
+        "androidx.savedstate_savedstate",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.lifecycle_lifecycle-viewmodel",
+    ],
+}
+
+android_library {
+    name: "etar-lib-androidx.appcompat_appcompat",
+    sdk_version: "current",
+    min_sdk_version: "14",
+    manifest: "AndroidManifest.xml",
+    static_libs: [
+        "etar-lib-androidx.appcompat_appcompat-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.cursoradapter_cursoradapter",
+        "androidx.activity_activity",
+        "androidx.fragment_fragment",
+        "etar-lib-androidx.appcompat_appcompat-resources",
+        "androidx.drawerlayout_drawerlayout",
+        "androidx.savedstate_savedstate",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.lifecycle_lifecycle-viewmodel",
+    ],
+    java_version: "1.7",
+}
diff --git a/libs/androidx.appcompat_appcompat/AndroidManifest.xml b/libs/androidx.appcompat_appcompat/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6321372f6dda1e7a440df5e35764c48bfb64ca9a
--- /dev/null
+++ b/libs/androidx.appcompat_appcompat/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.appcompat" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/androidx.appcompat_appcompat/appcompat-1.3.1.aar b/libs/androidx.appcompat_appcompat/appcompat-1.3.1.aar
new file mode 100644
index 0000000000000000000000000000000000000000..b4b279dd5a6e6d696f7b6eaf052db7d3c895cbbf
Binary files /dev/null and b/libs/androidx.appcompat_appcompat/appcompat-1.3.1.aar differ
diff --git a/libs/androidx.constraintlayout_constraintlayout-solver/Android.bp b/libs/androidx.constraintlayout_constraintlayout-solver/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..7e09b40609295f611ca7fd0b90e2357c00a43452
--- /dev/null
+++ b/libs/androidx.constraintlayout_constraintlayout-solver/Android.bp
@@ -0,0 +1,15 @@
+java_import {
+    name: "etar-lib-androidx-constraintlayout_constraintlayout-solver-nodeps",
+    jars: ["constraintlayout-solver-2.0.4.jar"],
+    sdk_version: "current",
+}
+
+java_library_static {
+    name: "etar-lib-androidx-constraintlayout_constraintlayout-solver",
+    sdk_version: "current",
+    min_sdk_version: "24",
+    static_libs: [
+        "etar-lib-androidx-constraintlayout_constraintlayout-solver-nodeps",
+    ],
+    java_version: "1.7",
+}
diff --git a/libs/androidx.constraintlayout_constraintlayout-solver/constraintlayout-solver-2.0.4.jar b/libs/androidx.constraintlayout_constraintlayout-solver/constraintlayout-solver-2.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..39f288b69862af9c13fdc6197cd8f594c54920a7
Binary files /dev/null and b/libs/androidx.constraintlayout_constraintlayout-solver/constraintlayout-solver-2.0.4.jar differ
diff --git a/libs/androidx.constraintlayout_constraintlayout/Android.bp b/libs/androidx.constraintlayout_constraintlayout/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..aeb513448b90dc990b9ca6ca5a9f98f29c1c7c91
--- /dev/null
+++ b/libs/androidx.constraintlayout_constraintlayout/Android.bp
@@ -0,0 +1,26 @@
+android_library_import {
+    name: "etar-lib-androidx-constraintlayout_constraintlayout-nodeps",
+    aars: ["constraintlayout-2.0.4.aar"],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    static_libs: [
+        "etar-lib-androidx.appcompat_appcompat",
+        "androidx.core_core",
+        "etar-lib-androidx-constraintlayout_constraintlayout-solver",
+    ],
+}
+
+android_library {
+    name: "etar-lib-androidx-constraintlayout_constraintlayout",
+    sdk_version: "current",
+    min_sdk_version: "14",
+    manifest: "AndroidManifest.xml",
+    static_libs: [
+        "etar-lib-androidx-constraintlayout_constraintlayout-nodeps",
+        "etar-lib-androidx.appcompat_appcompat",
+        "androidx.core_core",
+        "etar-lib-androidx-constraintlayout_constraintlayout-solver",
+    ],
+    java_version: "1.7",
+}
+
diff --git a/libs/androidx.constraintlayout_constraintlayout/AndroidManifest.xml b/libs/androidx.constraintlayout_constraintlayout/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7716d1ae06de90f86cff7a797e66b1a91feeb792
--- /dev/null
+++ b/libs/androidx.constraintlayout_constraintlayout/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.constraintlayout.widget" >
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="28" />
+</manifest>
diff --git a/libs/androidx.constraintlayout_constraintlayout/constraintlayout-2.0.4.aar b/libs/androidx.constraintlayout_constraintlayout/constraintlayout-2.0.4.aar
new file mode 100644
index 0000000000000000000000000000000000000000..f77b79c2c3cb9dd496d580e3ef0a71893de692f2
Binary files /dev/null and b/libs/androidx.constraintlayout_constraintlayout/constraintlayout-2.0.4.aar differ
diff --git a/libs/androidx.preference_preference/Android.bp b/libs/androidx.preference_preference/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..f412acc3153c71eb2629a5c9cc4a3d072e60c6cf
--- /dev/null
+++ b/libs/androidx.preference_preference/Android.bp
@@ -0,0 +1,31 @@
+android_library_import {
+    name: "etar-lib-androidx.preference_preference-nodeps",
+    aars: ["preference-1.2.0-alpha01.aar"],
+    sdk_version: "31",
+    min_sdk_version: "14",
+    static_libs: [
+        "etar-lib-androidx.appcompat_appcompat",
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.fragment_fragment",
+        "androidx.recyclerview_recyclerview",
+    ],
+}
+
+android_library {
+    name: "etar-lib-androidx.preference_preference",
+    sdk_version: "31",
+    min_sdk_version: "14",
+    manifest: "AndroidManifest.xml",
+    static_libs: [
+        "etar-lib-androidx.preference_preference-nodeps",
+        "etar-lib-androidx.appcompat_appcompat",
+        "androidx.annotation_annotation",
+        "androidx.collection_collection",
+        "androidx.core_core",
+        "androidx.fragment_fragment",
+        "androidx.recyclerview_recyclerview",
+    ],
+    java_version: "1.7",
+}
diff --git a/libs/androidx.preference_preference/AndroidManifest.xml b/libs/androidx.preference_preference/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1da0feea6448f1cde93e9422565f40d500f9eca
--- /dev/null
+++ b/libs/androidx.preference_preference/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.preference" >
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="31" />
+</manifest>
\ No newline at end of file
diff --git a/libs/androidx.preference_preference/preference-1.2.0-alpha01.aar b/libs/androidx.preference_preference/preference-1.2.0-alpha01.aar
new file mode 100644
index 0000000000000000000000000000000000000000..065ed06823e7a3515993af76220467ce136310ac
Binary files /dev/null and b/libs/androidx.preference_preference/preference-1.2.0-alpha01.aar differ
diff --git a/libs/com.google.android.material_material/Android.bp b/libs/com.google.android.material_material/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..f322870fc8cbf239958e64f4398b08f2c5d82e2c
--- /dev/null
+++ b/libs/com.google.android.material_material/Android.bp
@@ -0,0 +1,44 @@
+android_library_import {
+    name: "etar-lib-com.google.android.material_material-nodeps",
+    aars: ["material-1.6.1.aar"],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    static_libs: [
+        "etar-lib-androidx.appcompat_appcompat",
+        "etar-lib-androidx-constraintlayout_constraintlayout",
+        "androidx.cardview_cardview",
+        "androidx.coordinatorlayout_coordinatorlayout",
+        "androidx.core_core",
+        "androidx.legacy_legacy-support-core-ui",
+        "androidx.legacy_legacy-support-core-utils",
+        "androidx.fragment_fragment",
+        "androidx.recyclerview_recyclerview",
+        "androidx.transition_transition",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.viewpager2_viewpager2",
+    ],
+}
+
+android_library {
+    name: "etar-lib-com.google.android.material_material",
+    sdk_version: "current",
+    min_sdk_version: "14",
+    manifest: "AndroidManifest.xml",
+    static_libs: [
+        "etar-lib-com.google.android.material_material-nodeps",
+        "etar-lib-androidx-constraintlayout_constraintlayout",
+        "etar-lib-androidx.appcompat_appcompat",
+        "androidx.annotation_annotation",
+        "androidx.cardview_cardview",
+        "androidx.coordinatorlayout_coordinatorlayout",
+        "androidx.core_core",
+        "androidx.legacy_legacy-support-core-ui",
+        "androidx.legacy_legacy-support-core-utils",
+        "androidx.fragment_fragment",
+        "androidx.recyclerview_recyclerview",
+        "androidx.transition_transition",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.viewpager2_viewpager2",
+    ],
+    java_version: "1.7",
+}
diff --git a/libs/com.google.android.material_material/AndroidManifest.xml b/libs/com.google.android.material_material/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8152959fc1eb63d7abdfe4dd61d490f97b5eccae
--- /dev/null
+++ b/libs/com.google.android.material_material/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.material" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+    <application />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/com.google.android.material_material/material-1.6.1.aar b/libs/com.google.android.material_material/material-1.6.1.aar
new file mode 100644
index 0000000000000000000000000000000000000000..0cc04e0d0736c9f2169b175fb24e882a282aa232
Binary files /dev/null and b/libs/com.google.android.material_material/material-1.6.1.aar differ