diff --git a/Android.bp b/Android.bp
index dd016ed..414e0c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,1167 +3,1912 @@
 
 cc_defaults {
     name: "ndk_3_defaults",
+    sdk_version: "3",
     arch: {
-        arm64: { enabled: false, },
-        mips: { enabled: false, },
-        mips64: { enabled: false, },
-        x86: { enabled: false, },
-        x86_64: { enabled: false, },
+        arm: {
+            export_include_dirs: ["current/platforms/android-3/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-3/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-3/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-3/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-3/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-3/arch-x86_64/usr/include"],
+        },
     },
 }
 
 cc_defaults {
     name: "ndk_4_defaults",
+    sdk_version: "4",
     arch: {
-        arm64: { enabled: false, },
-        mips: { enabled: false, },
-        mips64: { enabled: false, },
-        x86: { enabled: false, },
-        x86_64: { enabled: false, },
+        arm: {
+            export_include_dirs: ["current/platforms/android-4/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-4/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-4/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-4/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-4/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-4/arch-x86_64/usr/include"],
+        },
     },
 }
 
 cc_defaults {
     name: "ndk_5_defaults",
+    sdk_version: "5",
     arch: {
-        arm64: { enabled: false, },
-        mips: { enabled: false, },
-        mips64: { enabled: false, },
-        x86: { enabled: false, },
-        x86_64: { enabled: false, },
+        arm: {
+            export_include_dirs: ["current/platforms/android-5/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-5/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-5/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-5/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-5/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-5/arch-x86_64/usr/include"],
+        },
     },
 }
 
 cc_defaults {
     name: "ndk_6_defaults",
+    sdk_version: "6",
     arch: {
-        arm64: { enabled: false, },
-        mips: { enabled: false, },
-        mips64: { enabled: false, },
-        x86: { enabled: false, },
-        x86_64: { enabled: false, },
+        arm: {
+            export_include_dirs: ["current/platforms/android-6/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-6/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-6/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-6/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-6/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-6/arch-x86_64/usr/include"],
+        },
     },
 }
 
 cc_defaults {
     name: "ndk_7_defaults",
+    sdk_version: "7",
     arch: {
-        arm64: { enabled: false, },
-        mips: { enabled: false, },
-        mips64: { enabled: false, },
-        x86: { enabled: false, },
-        x86_64: { enabled: false, },
+        arm: {
+            export_include_dirs: ["current/platforms/android-7/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-7/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-7/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-7/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-7/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-7/arch-x86_64/usr/include"],
+        },
     },
 }
 
 cc_defaults {
     name: "ndk_8_defaults",
+    sdk_version: "8",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-8/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-8/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-8/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-8/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-8/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-8/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_9_defaults",
+    sdk_version: "9",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-9/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-9/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-9/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-9/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-9/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-9/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_10_defaults",
+    sdk_version: "10",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-10/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-10/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-10/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-10/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-10/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-10/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_11_defaults",
+    sdk_version: "11",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-11/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-11/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-11/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-11/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-11/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-11/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_12_defaults",
+    sdk_version: "12",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-12/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-12/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-12/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-12/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-12/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-12/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_13_defaults",
+    sdk_version: "13",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-13/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-13/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-13/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-13/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-13/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-13/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_14_defaults",
+    sdk_version: "14",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-14/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-14/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-14/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-14/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-14/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-14/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_15_defaults",
+    sdk_version: "15",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-15/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-15/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-15/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-15/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-15/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-15/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_16_defaults",
+    sdk_version: "16",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-16/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-16/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-16/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-16/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-16/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-16/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_17_defaults",
+    sdk_version: "17",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-17/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-17/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-17/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-17/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-17/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-17/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_18_defaults",
+    sdk_version: "18",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-18/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-18/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-18/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-18/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-18/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-18/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_19_defaults",
+    sdk_version: "19",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-19/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-19/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-19/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-19/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-19/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-19/arch-x86_64/usr/include"],
+        },
+    },
+}
+
+cc_defaults {
+    name: "ndk_20_defaults",
+    sdk_version: "20",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-20/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-20/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-20/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-20/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-20/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-20/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 cc_defaults {
     name: "ndk_21_defaults",
+    sdk_version: "21",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-21/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-21/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-21/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-21/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-21/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-21/arch-x86_64/usr/include"],
+        },
+    },
+}
+
+cc_defaults {
+    name: "ndk_22_defaults",
+    sdk_version: "22",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-22/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-22/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-22/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-22/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-22/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-22/arch-x86_64/usr/include"],
+        },
+    },
+}
+
+cc_defaults {
+    name: "ndk_23_defaults",
+    sdk_version: "23",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-23/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-23/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-23/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-23/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-23/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-23/arch-x86_64/usr/include"],
+        },
+    },
+}
+
+cc_defaults {
+    name: "ndk_24_defaults",
+    sdk_version: "24",
+    arch: {
+        arm: {
+            export_include_dirs: ["current/platforms/android-24/arch-arm/usr/include"],
+        },
+        arm64: {
+            export_include_dirs: ["current/platforms/android-24/arch-arm64/usr/include"],
+        },
+        mips: {
+            export_include_dirs: ["current/platforms/android-24/arch-mips/usr/include"],
+        },
+        mips64: {
+            export_include_dirs: ["current/platforms/android-24/arch-mips64/usr/include"],
+        },
+        x86: {
+            export_include_dirs: ["current/platforms/android-24/arch-x86/usr/include"],
+        },
+        x86_64: {
+            export_include_dirs: ["current/platforms/android-24/arch-x86_64/usr/include"],
+        },
+    },
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.3",
     defaults: ["ndk_3_defaults"],
-    sdk_version: "3",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-3/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.3",
+    defaults: ["ndk_3_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.3",
+    defaults: ["ndk_3_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.3",
     defaults: ["ndk_3_defaults"],
-    sdk_version: "3",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-3/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.3",
+    defaults: ["ndk_3_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.3",
+    defaults: ["ndk_3_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.4",
+    defaults: ["ndk_4_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.4",
     defaults: ["ndk_4_defaults"],
-    sdk_version: "4",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-4/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.4",
+    defaults: ["ndk_4_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.4",
+    defaults: ["ndk_4_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.4",
     defaults: ["ndk_4_defaults"],
-    sdk_version: "4",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-4/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.4",
+    defaults: ["ndk_4_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.4",
+    defaults: ["ndk_4_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.5",
+    defaults: ["ndk_5_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.5",
+    defaults: ["ndk_5_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.5",
     defaults: ["ndk_5_defaults"],
-    sdk_version: "5",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-5/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.5",
+    defaults: ["ndk_5_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.5",
+    defaults: ["ndk_5_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.5",
     defaults: ["ndk_5_defaults"],
-    sdk_version: "5",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-5/arch-arm/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.5",
+    defaults: ["ndk_5_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.5",
+    defaults: ["ndk_5_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.8",
+    defaults: ["ndk_8_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.8",
+    defaults: ["ndk_8_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.8",
     defaults: ["ndk_8_defaults"],
-    sdk_version: "8",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-8/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-8/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-8/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-8/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-8/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-8/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.8",
+    defaults: ["ndk_8_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.8",
+    defaults: ["ndk_8_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.8",
+    defaults: ["ndk_8_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.8",
     defaults: ["ndk_8_defaults"],
-    sdk_version: "8",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-8/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-8/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-8/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-8/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-8/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-8/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.8",
+    defaults: ["ndk_8_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.8",
+    defaults: ["ndk_8_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.9",
+    defaults: ["ndk_9_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.9",
     defaults: ["ndk_9_defaults"],
-    sdk_version: "9",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-9/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-9/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-9/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-9/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-9/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-9/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.9",
+    defaults: ["ndk_9_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.9",
     defaults: ["ndk_9_defaults"],
-    sdk_version: "9",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-9/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-9/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-9/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-9/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-9/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-9/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.12",
+    defaults: ["ndk_12_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.12",
     defaults: ["ndk_12_defaults"],
-    sdk_version: "12",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-12/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-12/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-12/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-12/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-12/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-12/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.12",
+    defaults: ["ndk_12_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.12",
     defaults: ["ndk_12_defaults"],
-    sdk_version: "12",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-12/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-12/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-12/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-12/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-12/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-12/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.13",
+    defaults: ["ndk_13_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.13",
     defaults: ["ndk_13_defaults"],
-    sdk_version: "13",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-13/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-13/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-13/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-13/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-13/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-13/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.13",
+    defaults: ["ndk_13_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.13",
     defaults: ["ndk_13_defaults"],
-    sdk_version: "13",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-13/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-13/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-13/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-13/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-13/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-13/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.14",
+    defaults: ["ndk_14_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.14",
     defaults: ["ndk_14_defaults"],
-    sdk_version: "14",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-14/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-14/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-14/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-14/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-14/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-14/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.14",
+    defaults: ["ndk_14_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.14",
     defaults: ["ndk_14_defaults"],
-    sdk_version: "14",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-14/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-14/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-14/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-14/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-14/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-14/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.15",
+    defaults: ["ndk_15_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.15",
     defaults: ["ndk_15_defaults"],
-    sdk_version: "15",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-15/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-15/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-15/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-15/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-15/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-15/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.15",
+    defaults: ["ndk_15_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.15",
     defaults: ["ndk_15_defaults"],
-    sdk_version: "15",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-15/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-15/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-15/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-15/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-15/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-15/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.16",
+    defaults: ["ndk_16_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.16",
     defaults: ["ndk_16_defaults"],
-    sdk_version: "16",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-16/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-16/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-16/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-16/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-16/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-16/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.16",
+    defaults: ["ndk_16_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.16",
     defaults: ["ndk_16_defaults"],
-    sdk_version: "16",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-16/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-16/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-16/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-16/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-16/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-16/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.17",
+    defaults: ["ndk_17_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.17",
     defaults: ["ndk_17_defaults"],
-    sdk_version: "17",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-17/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-17/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-17/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-17/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-17/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-17/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.17",
+    defaults: ["ndk_17_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.17",
     defaults: ["ndk_17_defaults"],
-    sdk_version: "17",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-17/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-17/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-17/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-17/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-17/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-17/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv3.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.18",
+    defaults: ["ndk_18_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.18",
     defaults: ["ndk_18_defaults"],
-    sdk_version: "18",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-18/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-18/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-18/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-18/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-18/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-18/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.18",
+    defaults: ["ndk_18_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.18",
     defaults: ["ndk_18_defaults"],
-    sdk_version: "18",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-18/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-18/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-18/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-18/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-18/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-18/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv3.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.19",
+    defaults: ["ndk_19_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.19",
     defaults: ["ndk_19_defaults"],
-    sdk_version: "19",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-19/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-19/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-19/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-19/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-19/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-19/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.19",
+    defaults: ["ndk_19_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.19",
     defaults: ["ndk_19_defaults"],
-    sdk_version: "19",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-19/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-19/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-19/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-19/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-19/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-19/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv3.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.21",
+    defaults: ["ndk_21_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libc.21",
     defaults: ["ndk_21_defaults"],
-    sdk_version: "21",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-21/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-21/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-21/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-21/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-21/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-21/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.21",
+    defaults: ["ndk_21_defaults"],
 }
 
 ndk_prebuilt_library {
     name: "ndk_libm.21",
     defaults: ["ndk_21_defaults"],
-    sdk_version: "21",
-    arch: {
-        arm: {
-            export_include_dirs: ["current/platforms/android-21/arch-arm/usr/include"],
-        },
-        arm64: {
-            export_include_dirs: ["current/platforms/android-21/arch-arm64/usr/include"],
-        },
-        mips: {
-            export_include_dirs: ["current/platforms/android-21/arch-mips/usr/include"],
-        },
-        mips64: {
-            export_include_dirs: ["current/platforms/android-21/arch-mips64/usr/include"],
-        },
-        x86: {
-            export_include_dirs: ["current/platforms/android-21/arch-x86/usr/include"],
-        },
-        x86_64: {
-            export_include_dirs: ["current/platforms/android-21/arch-x86_64/usr/include"],
-        },
-    },
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libmediandk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv3.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libc.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libm.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libmediandk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libEGL.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv1_CM.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv2.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libGLESv3.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenMAXAL.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libOpenSLES.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libandroid.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libc.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libdl.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libjnigraphics.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_liblog.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libm.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libmediandk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libstdc++.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libvulkan.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "ndk_libz.24",
+    defaults: ["ndk_24_defaults"],
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.3",
-    defaults: ["ndk_3_defaults"],
     sdk_version: "3",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.3",
-    defaults: ["ndk_3_defaults"],
     sdk_version: "3",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.3",
-    defaults: ["ndk_3_defaults"],
     sdk_version: "3",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.3",
-    defaults: ["ndk_3_defaults"],
     sdk_version: "3",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.3",
-    defaults: ["ndk_3_defaults"],
     sdk_version: "3",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.4",
-    defaults: ["ndk_4_defaults"],
     sdk_version: "4",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.4",
-    defaults: ["ndk_4_defaults"],
     sdk_version: "4",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.4",
-    defaults: ["ndk_4_defaults"],
     sdk_version: "4",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.4",
-    defaults: ["ndk_4_defaults"],
     sdk_version: "4",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.4",
-    defaults: ["ndk_4_defaults"],
     sdk_version: "4",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.5",
-    defaults: ["ndk_5_defaults"],
     sdk_version: "5",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.5",
-    defaults: ["ndk_5_defaults"],
     sdk_version: "5",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.5",
-    defaults: ["ndk_5_defaults"],
     sdk_version: "5",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.5",
-    defaults: ["ndk_5_defaults"],
     sdk_version: "5",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.5",
-    defaults: ["ndk_5_defaults"],
     sdk_version: "5",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.8",
-    defaults: ["ndk_8_defaults"],
     sdk_version: "8",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.8",
-    defaults: ["ndk_8_defaults"],
     sdk_version: "8",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.8",
-    defaults: ["ndk_8_defaults"],
     sdk_version: "8",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.8",
-    defaults: ["ndk_8_defaults"],
     sdk_version: "8",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.8",
-    defaults: ["ndk_8_defaults"],
     sdk_version: "8",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.9",
-    defaults: ["ndk_9_defaults"],
     sdk_version: "9",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.9",
-    defaults: ["ndk_9_defaults"],
     sdk_version: "9",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.9",
-    defaults: ["ndk_9_defaults"],
     sdk_version: "9",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.9",
-    defaults: ["ndk_9_defaults"],
     sdk_version: "9",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.9",
-    defaults: ["ndk_9_defaults"],
     sdk_version: "9",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.12",
-    defaults: ["ndk_12_defaults"],
     sdk_version: "12",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.12",
-    defaults: ["ndk_12_defaults"],
     sdk_version: "12",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.12",
-    defaults: ["ndk_12_defaults"],
     sdk_version: "12",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.12",
-    defaults: ["ndk_12_defaults"],
     sdk_version: "12",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.12",
-    defaults: ["ndk_12_defaults"],
     sdk_version: "12",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.13",
-    defaults: ["ndk_13_defaults"],
     sdk_version: "13",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.13",
-    defaults: ["ndk_13_defaults"],
     sdk_version: "13",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.13",
-    defaults: ["ndk_13_defaults"],
     sdk_version: "13",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.13",
-    defaults: ["ndk_13_defaults"],
     sdk_version: "13",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.13",
-    defaults: ["ndk_13_defaults"],
     sdk_version: "13",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.14",
-    defaults: ["ndk_14_defaults"],
     sdk_version: "14",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.14",
-    defaults: ["ndk_14_defaults"],
     sdk_version: "14",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.14",
-    defaults: ["ndk_14_defaults"],
     sdk_version: "14",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.14",
-    defaults: ["ndk_14_defaults"],
     sdk_version: "14",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.14",
-    defaults: ["ndk_14_defaults"],
     sdk_version: "14",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.15",
-    defaults: ["ndk_15_defaults"],
     sdk_version: "15",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.15",
-    defaults: ["ndk_15_defaults"],
     sdk_version: "15",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.15",
-    defaults: ["ndk_15_defaults"],
     sdk_version: "15",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.15",
-    defaults: ["ndk_15_defaults"],
     sdk_version: "15",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.15",
-    defaults: ["ndk_15_defaults"],
     sdk_version: "15",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.16",
-    defaults: ["ndk_16_defaults"],
     sdk_version: "16",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.16",
-    defaults: ["ndk_16_defaults"],
     sdk_version: "16",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.16",
-    defaults: ["ndk_16_defaults"],
     sdk_version: "16",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.16",
-    defaults: ["ndk_16_defaults"],
     sdk_version: "16",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.16",
-    defaults: ["ndk_16_defaults"],
     sdk_version: "16",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.17",
-    defaults: ["ndk_17_defaults"],
     sdk_version: "17",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.17",
-    defaults: ["ndk_17_defaults"],
     sdk_version: "17",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.17",
-    defaults: ["ndk_17_defaults"],
     sdk_version: "17",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.17",
-    defaults: ["ndk_17_defaults"],
     sdk_version: "17",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.17",
-    defaults: ["ndk_17_defaults"],
     sdk_version: "17",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.18",
-    defaults: ["ndk_18_defaults"],
     sdk_version: "18",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.18",
-    defaults: ["ndk_18_defaults"],
     sdk_version: "18",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.18",
-    defaults: ["ndk_18_defaults"],
     sdk_version: "18",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.18",
-    defaults: ["ndk_18_defaults"],
     sdk_version: "18",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.18",
-    defaults: ["ndk_18_defaults"],
     sdk_version: "18",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.19",
-    defaults: ["ndk_19_defaults"],
     sdk_version: "19",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.19",
-    defaults: ["ndk_19_defaults"],
     sdk_version: "19",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.19",
-    defaults: ["ndk_19_defaults"],
     sdk_version: "19",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.19",
-    defaults: ["ndk_19_defaults"],
     sdk_version: "19",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.19",
-    defaults: ["ndk_19_defaults"],
     sdk_version: "19",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.21",
-    defaults: ["ndk_21_defaults"],
     sdk_version: "21",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_so.21",
-    defaults: ["ndk_21_defaults"],
     sdk_version: "21",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtbegin_static.21",
-    defaults: ["ndk_21_defaults"],
     sdk_version: "21",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_android.21",
-    defaults: ["ndk_21_defaults"],
     sdk_version: "21",
 }
 
 ndk_prebuilt_object {
     name: "ndk_crtend_so.21",
-    defaults: ["ndk_21_defaults"],
     sdk_version: "21",
 }
 
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_dynamic.23",
+    sdk_version: "23",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_so.23",
+    sdk_version: "23",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_static.23",
+    sdk_version: "23",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_android.23",
+    sdk_version: "23",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_so.23",
+    sdk_version: "23",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_dynamic.24",
+    sdk_version: "24",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_so.24",
+    sdk_version: "24",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtbegin_static.24",
+    sdk_version: "24",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_android.24",
+    sdk_version: "24",
+}
+
+ndk_prebuilt_object {
+    name: "ndk_crtend_so.24",
+    sdk_version: "24",
+}
+
 build = ["stl.bp"]
diff --git a/gen-blueprints.py b/gen-blueprints.py
index 43561d8..093a13b 100755
--- a/gen-blueprints.py
+++ b/gen-blueprints.py
@@ -52,13 +52,16 @@
 
         for arch in ['arm', 'arm64', 'mips', 'mips64', 'x86', 'x86_64']:
             arch_path = local_path(
-                'current/platforms/android-{sdk}/arch-{arch}'.format(sdk=sdk, arch=arch))
-            if not os.path.exists(arch_path):
+                'current/platforms/android-{sdk}/arch-{arch}/usr/include'.format(sdk=sdk, arch=arch))
+            if os.path.exists(arch_path):
                 arch_flags.append(
-                    '        {arch}: {{ enabled: false, }},'.format(arch=arch))
+                    '        {arch}: {{\n'
+                    '            export_include_dirs: ["{includes}"],\n'
+                    '        }},'.format(arch=arch, includes=arch_path))
 
         default.append('cc_defaults {{\n'
-                       '    name: "ndk_{version}_defaults",'.format(version=sdk))
+                       '    name: "ndk_{version}_defaults",\n'
+                       '    sdk_version: "{version}",'.format(version=sdk))
         if len(arch_flags) > 0:
             default.append('    arch: {{\n{arch_flags}\n'
                            '    }},'.format(arch_flags='\n'.join(arch_flags)))
@@ -76,31 +79,15 @@
 
 
 def gen_lib_prebuilt(prebuilt, name, version):
-    platform = os.path.join('current', 'platforms',
-                            prebuilt.partition('/')[0])
-    includes = os.path.join(platform, 'arch-{}/usr/include')
-    arch_flags = []
-    for arch in ['arm', 'arm64', 'mips', 'mips64', 'x86', 'x86_64']:
-        inc = includes.format(arch)
-        if os.path.exists(inc):
-            arch_flags.append(
-                '        {arch}: {{\n'
-                '            export_include_dirs: ["{includes}"],\n'
-                '        }},'.format(arch=arch, includes=inc))
     return ('ndk_prebuilt_library {{\n'
             '    name: "ndk_{name}.{version}",\n'
             '    defaults: ["ndk_{version}_defaults"],\n'
-            '    sdk_version: "{version}",\n'
-            '    arch: {{\n{arch_flags}\n'
-            '    }},\n'
-            '}}'.format(name=name, version=version,
-                        arch_flags='\n'.join(arch_flags)))
+            '}}'.format(name=name, version=version))
 
 
 def gen_crt_prebuilt(_, name, version):
     return ('ndk_prebuilt_object {{\n'
             '    name: "ndk_{name}.{version}",\n'
-            '    defaults: ["ndk_{version}_defaults"],\n'
             '    sdk_version: "{version}",\n'
             '}}'.format(name=name, version=version))
 
@@ -116,7 +103,23 @@
 
 def main():
     blueprints = gen_defaults()
-    blueprints.extend(gen_prebuilts(gen_lib_prebuilt, ('libc.so', 'libm.so')))
+    blueprints.extend(gen_prebuilts(gen_lib_prebuilt, (
+        'libandroid.so',
+        'libc.so',
+        'libdl.so',
+        'libEGL.so',
+        'libGLESv1_CM.so',
+        'libGLESv2.so',
+        'libGLESv3.so',
+        'libjnigraphics.so',
+        'liblog.so',
+        'libmediandk.so',
+        'libm.so',
+        'libOpenMAXAL.so',
+        'libOpenSLES.so',
+        'libstdc++.so',
+        'libvulkan.so',
+        'libz.so')))
     blueprints.extend(gen_prebuilts(gen_crt_prebuilt, (
         'crtbegin_so.o',
         'crtend_so.o',