diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtbegin_dynamic.o
deleted file mode 100644
index d3c366bf0..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtbegin_dynamic.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtend_android.o
deleted file mode 100644
index 6936f73e1..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/crtend_android.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtbegin_dynamic.o
index 8d2d6800c..0938d8a72 100644
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtbegin_dynamic.o and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtend_android.o
index 20a1a26bb..c62fea0e8 100644
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtend_android.o and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/crtend_android.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libc.so
index 3e8871ddf..de1f6a969 100755
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libc.so and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libc.so differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libdl.so
index 3c9e27923..b6d32ed58 100755
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libdl.so and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib/libdl.so differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o
deleted file mode 100644
index c8951c48d..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o
deleted file mode 100644
index d646968e8..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so
deleted file mode 100755
index 95549575d..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o
deleted file mode 100644
index da6f081a3..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o
deleted file mode 100644
index 1211dc6cc..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so
deleted file mode 100755
index 1de0b20ac..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so
deleted file mode 100755
index 86f9fa8fb..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libc.so
deleted file mode 100755
index 846248209..000000000
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libc.so and /dev/null differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtbegin_dynamic.o
new file mode 100644
index 000000000..e585a1e89
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtend_android.o
new file mode 100644
index 000000000..7572bef83
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/crtend_android.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libc.so
new file mode 100755
index 000000000..683b9518b
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libc.so differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libdl.so
similarity index 95%
rename from ndk/platforms/android-9/arch-mips/lib-bootstrap/libdl.so
rename to ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libdl.so
index 62d382ef1..86c839ee8 100755
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libdl.so and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr2/libdl.so differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtbegin_dynamic.o
new file mode 100644
index 000000000..59d819221
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtend_android.o
new file mode 100644
index 000000000..9fc01e88b
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/crtend_android.o differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libc.so
new file mode 100755
index 000000000..3cbeddb23
Binary files /dev/null and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libc.so differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libdl.so
similarity index 89%
rename from ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so
rename to ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libdl.so
index 66e219ca5..23fbcc0e3 100755
Binary files a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so and b/ndk/platforms/android-9/arch-mips/lib-bootstrap/libr6/libdl.so differ
diff --git a/ndk/platforms/android-9/arch-mips/libr2 b/ndk/platforms/android-9/arch-mips/libr2
new file mode 120000
index 000000000..7951405f8
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/libr2
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/ndk/platforms/android-9/arch-mips/libr6 b/ndk/platforms/android-9/arch-mips/libr6
new file mode 120000
index 000000000..f07d413b3
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/libr6
@@ -0,0 +1 @@
+../../android-L/arch-mips64/libr6
\ No newline at end of file
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o
index 148184759..b7e71c261 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o
index ca862366e..0d9a9f8f4 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so
index 27a91d8c1..046420c37 100755
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so
index afca07730..c692462bc 100755
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtbegin_dynamic.o
deleted file mode 100644
index 56f844e02..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtbegin_dynamic.o and /dev/null differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtend_android.o
deleted file mode 100644
index eb3c11692..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/crtend_android.o and /dev/null differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libc.so
deleted file mode 100755
index 1b54b7670..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libc.so and /dev/null differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o
index f70d0e2cb..a82686bbe 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o
index db176a4db..5baefa2ee 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so
index 42c711b50..83086c624 100755
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so
index 3d18141ee..0c519b2ac 100755
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o
new file mode 100644
index 000000000..0ccead7f4
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o
new file mode 100644
index 000000000..54d930def
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libc.so
new file mode 100755
index 000000000..d568ed252
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libc.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libdl.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libdl.so
new file mode 100755
index 000000000..a64b57999
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libdl.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o
new file mode 100644
index 000000000..dd6f1505e
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtend_android.o
new file mode 100644
index 000000000..e171cb724
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtend_android.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libc.so
new file mode 100755
index 000000000..7adefaf11
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libc.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libdl.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libdl.so
similarity index 89%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libdl.so
rename to ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libdl.so
index e467a0645..c2a9a7d19 100755
Binary files a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib32/libdl.so and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libdl.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o
new file mode 100644
index 000000000..1e206f58b
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtend_android.o b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtend_android.o
new file mode 100644
index 000000000..3402fd4de
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtend_android.o differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libc.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libc.so
new file mode 100755
index 000000000..bfc69c639
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libc.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libdl.so b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libdl.so
new file mode 100755
index 000000000..037db3c90
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libdl.so differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libc.a b/ndk/platforms/android-L/arch-mips64/lib/libc.a
new file mode 100644
index 000000000..9d32b5f23
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libm.a b/ndk/platforms/android-L/arch-mips64/lib/libm.a
new file mode 100644
index 000000000..50e741ac3
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a
new file mode 100644
index 000000000..952bbd174
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libz.a b/ndk/platforms/android-L/arch-mips64/lib/libz.a
new file mode 100644
index 000000000..0ebd2a1a1
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libc.a b/ndk/platforms/android-L/arch-mips64/lib64/libc.a
index 4414b5c8f..a2ff0906d 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libc.a and b/ndk/platforms/android-L/arch-mips64/lib64/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libm.a b/ndk/platforms/android-L/arch-mips64/lib64/libm.a
index 59779f090..fbb96631a 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libm.a and b/ndk/platforms/android-L/arch-mips64/lib64/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a b/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a
index ab62cf5b8..1a9477177 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a and b/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libz.a b/ndk/platforms/android-L/arch-mips64/lib64/libz.a
index 0c3dfb6f3..1268279e8 100644
Binary files a/ndk/platforms/android-L/arch-mips64/lib64/libz.a and b/ndk/platforms/android-L/arch-mips64/lib64/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libc.a b/ndk/platforms/android-L/arch-mips64/lib64r2/libc.a
new file mode 100644
index 000000000..6b02bf2af
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib64r2/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libm.a b/ndk/platforms/android-L/arch-mips64/lib64r2/libm.a
new file mode 100644
index 000000000..f7f83d92b
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib64r2/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libstdc++.a b/ndk/platforms/android-L/arch-mips64/lib64r2/libstdc++.a
new file mode 100644
index 000000000..9c4e35d47
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib64r2/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libz.a b/ndk/platforms/android-L/arch-mips64/lib64r2/libz.a
new file mode 100644
index 000000000..842b5a55f
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/lib64r2/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libc.a b/ndk/platforms/android-L/arch-mips64/libr2/libc.a
new file mode 100644
index 000000000..9d32b5f23
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr2/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libm.a b/ndk/platforms/android-L/arch-mips64/libr2/libm.a
new file mode 100644
index 000000000..50e741ac3
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr2/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libstdc++.a b/ndk/platforms/android-L/arch-mips64/libr2/libstdc++.a
new file mode 100644
index 000000000..952bbd174
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr2/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libz.a b/ndk/platforms/android-L/arch-mips64/libr2/libz.a
new file mode 100644
index 000000000..0ebd2a1a1
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr2/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libc.a b/ndk/platforms/android-L/arch-mips64/libr6/libc.a
new file mode 100644
index 000000000..a4df17a1a
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr6/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libm.a b/ndk/platforms/android-L/arch-mips64/libr6/libm.a
new file mode 100644
index 000000000..c9681bd68
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr6/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libstdc++.a b/ndk/platforms/android-L/arch-mips64/libr6/libstdc++.a
new file mode 100644
index 000000000..a9829c8c7
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr6/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libz.a b/ndk/platforms/android-L/arch-mips64/libr6/libz.a
new file mode 100644
index 000000000..39549364a
Binary files /dev/null and b/ndk/platforms/android-L/arch-mips64/libr6/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips64/src/crtbegin.c b/ndk/platforms/android-L/arch-mips64/src/crtbegin.c
index 2ea31ad64..1fe81770c 100644
--- a/ndk/platforms/android-L/arch-mips64/src/crtbegin.c
+++ b/ndk/platforms/android-L/arch-mips64/src/crtbegin.c
@@ -49,6 +49,8 @@ __LIBC_HIDDEN__  void do_mips_start(void *raw_args) {
   __libc_init(raw_args, NULL, &main, &array);
 }
 
+#if defined(__LP64__)
+
 /*
  * This function prepares the return address with a branch-and-link
  * instruction (bal) and then uses a .cpsetup to compute the Global
@@ -90,5 +92,50 @@ __asm__ (
 "       .set pop                    \n"
 );
 
+#else
+
+/*
+ * This function prepares the return address with a branch-and-link
+ * instruction (bal) and then uses a .cpload to compute the Global
+ * Offset Table (GOT) pointer ($gp). The $gp is then used to load
+ * the address of _do_start() into $t9 just before calling it.
+ * Terminating the stack with a NULL return address.
+ */
+__asm__ (
+"       .set push                   \n"
+"                                   \n"
+"       .text                       \n"
+"       .align  4                   \n"
+"       .type __start,@function     \n"
+"       .globl __start              \n"
+"       .globl  _start              \n"
+"                                   \n"
+"       .ent    __start             \n"
+"__start:                           \n"
+" _start:                           \n"
+"       .frame   $sp,32,$ra         \n"
+"       .mask   0x80000000,-4       \n"
+"                                   \n"
+"       .set noreorder              \n"
+"       bal     1f                  \n"
+"       nop                         \n"
+"1:                                 \n"
+"       .cpload $ra                 \n"
+"       .set reorder                \n"
+"                                   \n"
+"       move    $a0, $sp            \n"
+"       addiu   $sp, $sp, (-32)     \n"
+"       sw      $0, 28($sp)         \n"
+"       la      $t9, do_mips_start  \n"
+"       jalr    $t9                 \n"
+"                                   \n"
+"2:     b       2b                  \n"
+"       .end    __start             \n"
+"                                   \n"
+"       .set pop                    \n"
+);
+
+#endif
+
 #include "../../arch-common/bionic/__dso_handle.h"
 #include "atexit.h"