Merge "Revert "Remove all prebuilt NDK system lib modules."" am: 88c70cd610 am: 3d326529a1 am: 529870a900
am: 7a12c1c6d9

Change-Id: I4ce601818cec7fd263edb844eb93337d16287b29
diff --git a/Android.bp b/Android.bp
index 430836d..9ae9398 100644
--- a/Android.bp
+++ b/Android.bp
@@ -401,6 +401,891 @@
     },
 }
 
+ndk_prebuilt_library {
+    name: "libEGL.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.9",
+    defaults: ["ndk_9_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.12",
+    defaults: ["ndk_12_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.13",
+    defaults: ["ndk_13_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.14",
+    defaults: ["ndk_14_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.15",
+    defaults: ["ndk_15_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.16",
+    defaults: ["ndk_16_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.17",
+    defaults: ["ndk_17_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.18",
+    defaults: ["ndk_18_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.19",
+    defaults: ["ndk_19_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libmediandk.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.21",
+    defaults: ["ndk_21_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libmediandk.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.22",
+    defaults: ["ndk_22_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libmediandk.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.23",
+    defaults: ["ndk_23_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libEGL.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv1_CM.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv2.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libGLESv3.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenMAXAL.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libOpenSLES.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libandroid.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libc.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libdl.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libjnigraphics.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "liblog.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libm.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libmediandk.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libstdc++.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libvulkan.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
+ndk_prebuilt_library {
+    name: "libz.ndk.24",
+    defaults: ["ndk_24_defaults"],
+}
+
 ndk_prebuilt_object {
     name: "ndk_crtbegin_dynamic.9",
     sdk_version: "9",
diff --git a/gen-blueprints.py b/gen-blueprints.py
index 192f4ae..18afd47 100755
--- a/gen-blueprints.py
+++ b/gen-blueprints.py
@@ -106,6 +106,23 @@
 
 def main():
     blueprints = gen_defaults()
+    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',