diff --git a/ndk/platforms/android-L/arch-arm/lib/libc.a b/ndk/platforms/android-L/arch-arm/lib/libc.a
index 4bda570b5..292f0dd88 100644
Binary files a/ndk/platforms/android-L/arch-arm/lib/libc.a and b/ndk/platforms/android-L/arch-arm/lib/libc.a differ
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
index ae713f104..7350fddcf 100644
--- a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
@@ -19,6 +19,10 @@ _Unwind_VRS_Get
 _Unwind_VRS_Pop
 _Unwind_VRS_Set
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -404,7 +408,6 @@ clone
 close
 closedir
 closelog
-closelog_r
 connect
 creat
 creat64
@@ -610,6 +613,7 @@ gmtime
 gmtime64
 gmtime64_r
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -637,6 +641,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -725,7 +730,6 @@ localtime
 localtime64
 localtime64_r
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -799,7 +803,6 @@ openat
 openat64
 opendir
 openlog
-openlog_r
 pathconf
 pause
 pclose
@@ -812,6 +815,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -944,6 +948,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -999,7 +1004,6 @@ setjmp
 setlinebuf
 setlocale
 setlogmask
-setlogmask_r
 setmntent
 setns
 setpgid
@@ -1073,7 +1077,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -1122,7 +1125,6 @@ syscall
 sysconf
 sysinfo
 syslog
-syslog_r
 system
 sysv_signal
 tcdrain
@@ -1171,6 +1173,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
@@ -1209,7 +1212,6 @@ vsscanf
 vswprintf
 vswscanf
 vsyslog
-vsyslog_r
 vwarn
 vwarnx
 vwprintf
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libc.a b/ndk/platforms/android-L/arch-arm64/lib/libc.a
index 684958a5a..6e15bdd54 100644
Binary files a/ndk/platforms/android-L/arch-arm64/lib/libc.a and b/ndk/platforms/android-L/arch-arm64/lib/libc.a differ
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libz.a b/ndk/platforms/android-L/arch-arm64/lib/libz.a
index 30e0468df..b241d42e4 100644
Binary files a/ndk/platforms/android-L/arch-arm64/lib/libz.a and b/ndk/platforms/android-L/arch-arm64/lib/libz.a differ
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt
index 0ad0b741a..f534b4357 100644
--- a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt
@@ -1,5 +1,9 @@
 _Exit
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -398,6 +402,7 @@ getwchar
 getxattr
 gmtime
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -424,6 +429,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -509,7 +515,6 @@ llistxattr
 localeconv
 localtime
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -593,6 +598,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -717,6 +723,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -844,7 +851,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -934,6 +940,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
diff --git a/ndk/platforms/android-L/arch-mips/lib/libc.a b/ndk/platforms/android-L/arch-mips/lib/libc.a
index 6840ac8cc..26d25b377 100644
Binary files a/ndk/platforms/android-L/arch-mips/lib/libc.a and b/ndk/platforms/android-L/arch-mips/lib/libc.a differ
diff --git a/ndk/platforms/android-L/arch-mips/lib/libm.a b/ndk/platforms/android-L/arch-mips/lib/libm.a
index e3c8fd27f..8cf8d4fb5 100644
Binary files a/ndk/platforms/android-L/arch-mips/lib/libm.a and b/ndk/platforms/android-L/arch-mips/lib/libm.a differ
diff --git a/ndk/platforms/android-L/arch-mips/lib/libstdc++.a b/ndk/platforms/android-L/arch-mips/lib/libstdc++.a
index 287e3d4f9..2d88bb902 100644
Binary files a/ndk/platforms/android-L/arch-mips/lib/libstdc++.a and b/ndk/platforms/android-L/arch-mips/lib/libstdc++.a differ
diff --git a/ndk/platforms/android-L/arch-mips/lib/libz.a b/ndk/platforms/android-L/arch-mips/lib/libz.a
index 26970b79c..230d0dd8f 100644
Binary files a/ndk/platforms/android-L/arch-mips/lib/libz.a and b/ndk/platforms/android-L/arch-mips/lib/libz.a differ
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
index de29b4f97..0efd84403 100644
--- a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
@@ -3,25 +3,11 @@ SHA1Init
 SHA1Transform
 SHA1Update
 _Exit
-_Unwind_Backtrace
-_Unwind_DeleteException
-_Unwind_FindEnclosingFunction
-_Unwind_Find_FDE
-_Unwind_ForcedUnwind
-_Unwind_GetCFA
-_Unwind_GetDataRelBase
-_Unwind_GetGR
-_Unwind_GetIP
-_Unwind_GetIPInfo
-_Unwind_GetLanguageSpecificData
-_Unwind_GetRegionStart
-_Unwind_GetTextRelBase
-_Unwind_RaiseException
-_Unwind_Resume
-_Unwind_Resume_or_Rethrow
-_Unwind_SetGR
-_Unwind_SetIP
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -49,9 +35,6 @@ __cxa_guard_abort
 __cxa_guard_acquire
 __cxa_guard_release
 __cxa_pure_virtual
-__deregister_frame
-__deregister_frame_info
-__deregister_frame_info_bases
 __divdi3
 __dn_comp
 __dn_count_labels
@@ -67,7 +50,6 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__frame_state_for
 __fstatfs64
 __futex_wait
 __futex_wake
@@ -130,12 +112,6 @@ __putshort
 __read_chk
 __reboot
 __recvfrom_chk
-__register_frame
-__register_frame_info
-__register_frame_info_bases
-__register_frame_info_table
-__register_frame_info_table_bases
-__register_frame_table
 __res_close
 __res_dnok
 __res_hnok
@@ -294,7 +270,6 @@ clone
 close
 closedir
 closelog
-closelog_r
 connect
 creat
 creat64
@@ -500,6 +475,7 @@ gmtime
 gmtime64
 gmtime64_r
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -527,6 +503,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -615,7 +592,6 @@ localtime
 localtime64
 localtime64_r
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -689,7 +665,6 @@ openat
 openat64
 opendir
 openlog
-openlog_r
 pathconf
 pause
 pclose
@@ -702,6 +677,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -834,6 +810,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -888,7 +865,6 @@ setjmp
 setlinebuf
 setlocale
 setlogmask
-setlogmask_r
 setmntent
 setns
 setpgid
@@ -962,7 +938,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -1011,7 +986,6 @@ syscall
 sysconf
 sysinfo
 syslog
-syslog_r
 system
 sysv_signal
 tcdrain
@@ -1060,6 +1034,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
@@ -1098,7 +1073,6 @@ vsscanf
 vswprintf
 vswscanf
 vsyslog
-vsyslog_r
 vwarn
 vwarnx
 vwprintf
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libc.a b/ndk/platforms/android-L/arch-mips64/lib/libc.a
deleted file mode 100644
index 6840ac8cc..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib/libc.a and /dev/null 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 120000
index 000000000..d95513dbb
--- /dev/null
+++ b/ndk/platforms/android-L/arch-mips64/lib/libc.a
@@ -0,0 +1 @@
+../../arch-mips/lib/libc.a
\ No newline at end of file
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libm.a b/ndk/platforms/android-L/arch-mips64/lib/libm.a
deleted file mode 100644
index 50e741ac3..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib/libm.a and /dev/null 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 120000
index 000000000..118d2e325
--- /dev/null
+++ b/ndk/platforms/android-L/arch-mips64/lib/libm.a
@@ -0,0 +1 @@
+../../arch-mips/lib/libm.a
\ No newline at end of file
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a
deleted file mode 100644
index 952bbd174..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a and /dev/null 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 120000
index 000000000..27e902faf
--- /dev/null
+++ b/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a
@@ -0,0 +1 @@
+../../arch-mips/lib/libstdc++.a
\ No newline at end of file
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libz.a b/ndk/platforms/android-L/arch-mips64/lib/libz.a
deleted file mode 100644
index 0ebd2a1a1..000000000
Binary files a/ndk/platforms/android-L/arch-mips64/lib/libz.a and /dev/null 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 120000
index 000000000..463370da7
--- /dev/null
+++ b/ndk/platforms/android-L/arch-mips64/lib/libz.a
@@ -0,0 +1 @@
+../../arch-mips/lib/libz.a
\ No newline at end of file
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libc.a b/ndk/platforms/android-L/arch-mips64/lib64/libc.a
index a5ecc50de..452219ec3 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 13d4b798c..434e9e52c 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 ed4cab479..b5b798d20 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 244f7559f..5b806f533 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/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt
index 456887b70..89e552f63 100644
--- a/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt
@@ -1,5 +1,9 @@
 _Exit
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -399,6 +403,7 @@ getwchar
 getxattr
 gmtime
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -425,6 +430,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -510,7 +516,6 @@ llistxattr
 localeconv
 localtime
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -594,6 +599,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -718,6 +724,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -845,7 +852,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -935,6 +941,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
diff --git a/ndk/platforms/android-L/arch-x86/lib/libc.a b/ndk/platforms/android-L/arch-x86/lib/libc.a
index e2e1cf984..e6c462872 100644
Binary files a/ndk/platforms/android-L/arch-x86/lib/libc.a and b/ndk/platforms/android-L/arch-x86/lib/libc.a differ
diff --git a/ndk/platforms/android-L/arch-x86/lib/libz.a b/ndk/platforms/android-L/arch-x86/lib/libz.a
index c908ce24c..b7899cf20 100644
Binary files a/ndk/platforms/android-L/arch-x86/lib/libz.a and b/ndk/platforms/android-L/arch-x86/lib/libz.a differ
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
index b18a8c740..dfcf99f37 100644
--- a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
@@ -3,25 +3,11 @@ SHA1Init
 SHA1Transform
 SHA1Update
 _Exit
-_Unwind_Backtrace
-_Unwind_DeleteException
-_Unwind_FindEnclosingFunction
-_Unwind_Find_FDE
-_Unwind_ForcedUnwind
-_Unwind_GetCFA
-_Unwind_GetDataRelBase
-_Unwind_GetGR
-_Unwind_GetIP
-_Unwind_GetIPInfo
-_Unwind_GetLanguageSpecificData
-_Unwind_GetRegionStart
-_Unwind_GetTextRelBase
-_Unwind_RaiseException
-_Unwind_Resume
-_Unwind_Resume_or_Rethrow
-_Unwind_SetGR
-_Unwind_SetIP
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -49,9 +35,6 @@ __cxa_guard_abort
 __cxa_guard_acquire
 __cxa_guard_release
 __cxa_pure_virtual
-__deregister_frame
-__deregister_frame_info
-__deregister_frame_info_bases
 __divdi3
 __dn_comp
 __dn_count_labels
@@ -67,7 +50,6 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__frame_state_for
 __fstatfs64
 __futex_wait
 __futex_wake
@@ -130,12 +112,6 @@ __putshort
 __read_chk
 __reboot
 __recvfrom_chk
-__register_frame
-__register_frame_info
-__register_frame_info_bases
-__register_frame_info_table
-__register_frame_info_table_bases
-__register_frame_table
 __res_close
 __res_dnok
 __res_hnok
@@ -290,7 +266,6 @@ clone
 close
 closedir
 closelog
-closelog_r
 connect
 creat
 creat64
@@ -496,6 +471,7 @@ gmtime
 gmtime64
 gmtime64_r
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -523,6 +499,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -611,7 +588,6 @@ localtime
 localtime64
 localtime64_r
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -685,7 +661,6 @@ openat
 openat64
 opendir
 openlog
-openlog_r
 pathconf
 pause
 pclose
@@ -698,6 +673,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -830,6 +806,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -884,7 +861,6 @@ setjmp
 setlinebuf
 setlocale
 setlogmask
-setlogmask_r
 setmntent
 setns
 setpgid
@@ -958,7 +934,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -1007,7 +982,6 @@ syscall
 sysconf
 sysinfo
 syslog
-syslog_r
 system
 sysv_signal
 tcdrain
@@ -1056,6 +1030,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
@@ -1094,7 +1069,6 @@ vsscanf
 vswprintf
 vswscanf
 vsyslog
-vsyslog_r
 vwarn
 vwarnx
 vwprintf
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/endian.h b/ndk/platforms/android-L/arch-x86_64/include/machine/endian.h
index 7889a374f..4d9060ba7 100644
--- a/ndk/platforms/android-L/arch-x86_64/include/machine/endian.h
+++ b/ndk/platforms/android-L/arch-x86_64/include/machine/endian.h
@@ -27,6 +27,8 @@
 #ifndef _MACHINE_ENDIAN_H_
 #define _MACHINE_ENDIAN_H_
 
+#include <sys/types.h>
+
 #ifdef __GNUC__
 
 #define	__swap32md(x) __statement({					\
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libc.a b/ndk/platforms/android-L/arch-x86_64/lib64/libc.a
index dae1be2dc..7cbbb6727 100644
Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libc.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libc.a differ
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libz.a b/ndk/platforms/android-L/arch-x86_64/lib64/libz.a
index 7e5b8c25b..17b5f7849 100644
Binary files a/ndk/platforms/android-L/arch-x86_64/lib64/libz.a and b/ndk/platforms/android-L/arch-x86_64/lib64/libz.a differ
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt
index 0ad0b741a..f534b4357 100644
--- a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt
@@ -1,5 +1,9 @@
 _Exit
 _Z16__libc_init_vdsov
+_ZN11ScopedTraceC1EPKc
+_ZN11ScopedTraceC2EPKc
+_ZN11ScopedTraceD1Ev
+_ZN11ScopedTraceD2Ev
 _ZdaPv
 _ZdaPvRKSt9nothrow_t
 _ZdlPv
@@ -398,6 +402,7 @@ getwchar
 getxattr
 gmtime
 gmtime_r
+grantpt
 herror
 hstrerror
 htonl
@@ -424,6 +429,7 @@ inotify_add_watch
 inotify_init
 inotify_init1
 inotify_rm_watch
+insque
 ioctl
 isalnum
 isalnum_l
@@ -509,7 +515,6 @@ llistxattr
 localeconv
 localtime
 localtime_r
-localtime_tz
 longjmp
 lrand48
 lremovexattr
@@ -593,6 +598,7 @@ popen
 posix_fallocate
 posix_fallocate64
 posix_memalign
+posix_openpt
 ppoll
 prctl
 pread
@@ -717,6 +723,7 @@ regexec
 regfree
 remove
 removexattr
+remque
 rename
 renameat
 res_init
@@ -844,7 +851,6 @@ strerror
 strerror_r
 strftime
 strftime_l
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -934,6 +940,7 @@ truncate64
 tsearch
 ttyname
 ttyname_r
+twalk
 tzset
 umask
 umount
diff --git a/ndk/platforms/android-L/include/grp.h b/ndk/platforms/android-L/include/grp.h
index 86d99f357..fc4d52031 100644
--- a/ndk/platforms/android-L/include/grp.h
+++ b/ndk/platforms/android-L/include/grp.h
@@ -43,10 +43,6 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#if __BSD_VISIBLE
-#define	_PATH_GROUP		"/etc/group"
-#endif
-
 struct group {
 	char	*gr_name;		/* group name */
 	char	*gr_passwd;		/* group password */
@@ -57,7 +53,7 @@ struct group {
 __BEGIN_DECLS
 struct group	*getgrgid(gid_t);
 struct group	*getgrnam(const char *);
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE
+#if __POSIX_VISIBLE >= 200112 || __XPG_VISIBLE
 struct group	*getgrent(void);
 void		 setgrent(void);
 void		 endgrent(void);
@@ -66,11 +62,6 @@ int		 getgrgid_r(gid_t, struct group *, char *,
 int		 getgrnam_r(const char *, struct group *, char *,
 		    size_t, struct group **);
 #endif
-#if __BSD_VISIBLE
-void		 setgrfile(const char *);
-int		 setgroupent(int);
-char		*group_from_gid(gid_t, int);
-#endif
 
 int   getgrouplist (const char *user, gid_t group,
                   gid_t *groups, int *ngroups);
diff --git a/ndk/platforms/android-L/include/search.h b/ndk/platforms/android-L/include/search.h
index b2c0e6b50..9b01e12b2 100644
--- a/ndk/platforms/android-L/include/search.h
+++ b/ndk/platforms/android-L/include/search.h
@@ -29,6 +29,9 @@ typedef struct node {
 
 __BEGIN_DECLS
 
+void insque(void*, void*);
+void remque(void*);
+
 void* lfind(const void*, const void*, size_t*, size_t, int (*)(const void*, const void*));
 void* lsearch(const void*, void*, size_t*, size_t, int (*)(const void*, const void*));
 
diff --git a/ndk/platforms/android-L/include/stdint.h b/ndk/platforms/android-L/include/stdint.h
index 9f588f737..02e3563bb 100644
--- a/ndk/platforms/android-L/include/stdint.h
+++ b/ndk/platforms/android-L/include/stdint.h
@@ -204,7 +204,7 @@ typedef int64_t       intmax_t;
 
 #if defined(__WINT_UNSIGNED__)
 #  define WINT_MAX       UINT32_MAX
-#  define WINT_MIN       UINT32_MIN
+#  define WINT_MIN       0
 #else
 #  define WINT_MAX       INT32_MAX
 #  define WINT_MIN       INT32_MIN
diff --git a/ndk/platforms/android-L/include/stdio.h b/ndk/platforms/android-L/include/stdio.h
index b9de12141..4d160a377 100644
--- a/ndk/platforms/android-L/include/stdio.h
+++ b/ndk/platforms/android-L/include/stdio.h
@@ -223,12 +223,6 @@ ssize_t	 getdelim(char ** __restrict, size_t * __restrict, int,
 	    FILE * __restrict);
 ssize_t	 getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
 
-#if __BSD_VISIBLE && !defined(__SYS_ERRLIST)
-#define __SYS_ERRLIST
-extern int sys_nerr;			/* perror(3) external variables */
-extern char *sys_errlist[];
-#endif
-
 void	 perror(const char *);
 int	 printf(const char * __restrict, ...)
 		__printflike(1, 2);
@@ -300,9 +294,6 @@ __END_DECLS
 #define	L_ctermid	1024	/* size for ctermid(); PATH_MAX */
 
 __BEGIN_DECLS
-#if 0 /* MISSING FROM BIONIC */
-char	*ctermid(char *);
-#endif /* MISSING */
 FILE	*fdopen(int, const char *);
 int	 fileno(FILE *);
 
diff --git a/ndk/platforms/android-L/include/stdlib.h b/ndk/platforms/android-L/include/stdlib.h
index caffd7ae5..39fad0f2e 100644
--- a/ndk/platforms/android-L/include/stdlib.h
+++ b/ndk/platforms/android-L/include/stdlib.h
@@ -126,18 +126,12 @@ long random(void);
 char* setstate(char*);
 void srandom(unsigned int);
 
-/* Basic PTY functions.  These only work if devpts is mounted! */
-
-extern int    unlockpt(int);
-extern char*  ptsname(int);
-extern int    ptsname_r(int, char*, size_t);
-extern int    getpt(void);
-
-static __inline__ int grantpt(int __fd __attribute((unused)))
-{
-  (void)__fd;
-  return 0;     /* devpts does this all for us! */
-}
+int getpt(void);
+int grantpt(int);
+int posix_openpt(int);
+char* ptsname(int) __warnattr("ptsname is not thread-safe; use ptsname_r instead");
+int ptsname_r(int, char*, size_t);
+int unlockpt(int);
 
 typedef struct {
     int  quot;
@@ -175,10 +169,6 @@ extern size_t	wcstombs(char *, const wchar_t *, size_t);
 
 #define MB_CUR_MAX 4U
 
-#if 0 /* MISSING FROM BIONIC */
-extern int on_exit(void (*)(int, void *), void *);
-#endif /* MISSING */
-
 __END_DECLS
 
 #endif /* _STDLIB_H_ */
diff --git a/ndk/platforms/android-L/include/sys/cdefs_elf.h b/ndk/platforms/android-L/include/sys/cdefs_elf.h
index d98197c37..a5fa7fb99 100644
--- a/ndk/platforms/android-L/include/sys/cdefs_elf.h
+++ b/ndk/platforms/android-L/include/sys/cdefs_elf.h
@@ -68,7 +68,7 @@
 #ifdef __LP64__
 #define __LIBC64_HIDDEN__ __LIBC_HIDDEN__
 #else
-#define __LIBC64_HIDDEN__
+#define __LIBC64_HIDDEN__ __LIBC_ABI_PUBLIC__
 #endif
 
 /* Used to tag non-static symbols that are public and exposed by the shared library. */
diff --git a/ndk/platforms/android-L/include/sys/syscall.h b/ndk/platforms/android-L/include/sys/syscall.h
index a44b2e5ba..34a29df3f 100644
--- a/ndk/platforms/android-L/include/sys/syscall.h
+++ b/ndk/platforms/android-L/include/sys/syscall.h
@@ -37,7 +37,7 @@
 
 __BEGIN_DECLS
 
-int syscall(int number, ...);
+long syscall(long number, ...);
 
 __END_DECLS
 
diff --git a/ndk/platforms/android-L/include/syslog.h b/ndk/platforms/android-L/include/syslog.h
index a52e81154..cbceab287 100644
--- a/ndk/platforms/android-L/include/syslog.h
+++ b/ndk/platforms/android-L/include/syslog.h
@@ -35,59 +35,60 @@
 
 __BEGIN_DECLS
 
-#define LOG_EMERG	0
-#define LOG_ALERT	1
-#define LOG_CRIT	2
-#define LOG_ERR		3
-#define LOG_WARNING	4
-#define LOG_NOTICE	5
-#define LOG_INFO	6
-#define LOG_DEBUG	7
+/* Priorities are translated to Android log priorities as shown. */
+#define LOG_EMERG   0 /* ERROR */
+#define LOG_ALERT   1 /* ERROR */
+#define LOG_CRIT    2 /* ERROR */
+#define LOG_ERR     3 /* ERROR */
+#define LOG_WARNING 4 /* WARN */
+#define LOG_NOTICE  5 /* INFO */
+#define LOG_INFO    6 /* INFO */
+#define LOG_DEBUG   7 /* DEBUG */
 
-#define LOG_PRIMASK	7
-#define LOG_PRI(x)	((x) & LOG_PRIMASK)
+#define LOG_PRIMASK 7
+#define LOG_PRI(x) ((x) & LOG_PRIMASK)
 
-#define LOG_KERN	0000
-#define LOG_USER	0010
-#define LOG_MAIL	0020
-#define LOG_DAEMON	0030
-#define LOG_AUTH	0040
-#define LOG_SYSLOG	0050
-#define LOG_LPR		0060
-#define LOG_NEWS	0070
-#define LOG_UUCP	0100
-#define LOG_CRON	0110
-#define LOG_AUTHPRIV	0120
-#define LOG_FTP		0130
-#define LOG_LOCAL0	0200
-#define LOG_LOCAL1	0210
-#define LOG_LOCAL2	0220
-#define LOG_LOCAL3	0230
-#define LOG_LOCAL4	0240
-#define LOG_LOCAL5	0250
-#define LOG_LOCAL6	0260
-#define LOG_LOCAL7	0270
+/* Facilities are currently ignored on Android. */
+#define LOG_KERN     0000
+#define LOG_USER     0010
+#define LOG_MAIL     0020
+#define LOG_DAEMON   0030
+#define LOG_AUTH     0040
+#define LOG_SYSLOG   0050
+#define LOG_LPR      0060
+#define LOG_NEWS     0070
+#define LOG_UUCP     0100
+#define LOG_CRON     0110
+#define LOG_AUTHPRIV 0120
+#define LOG_FTP      0130
+#define LOG_LOCAL0   0200
+#define LOG_LOCAL1   0210
+#define LOG_LOCAL2   0220
+#define LOG_LOCAL3   0230
+#define LOG_LOCAL4   0240
+#define LOG_LOCAL5   0250
+#define LOG_LOCAL6   0260
+#define LOG_LOCAL7   0270
 
-#define LOG_FACMASK	01770
-#define LOG_FAC(x)	(((x) >> 3) & (LOG_FACMASK >> 3))
+#define LOG_FACMASK 01770
+#define LOG_FAC(x) (((x) >> 3) & (LOG_FACMASK >> 3))
 
 #define LOG_MASK(pri) (1 << (pri))
 #define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1)
 
-#define LOG_PID    0x01    /* include pid with message */
-#define LOG_CONS   0x02    /* write to console on logger error */
-#define LOG_ODELAY 0x04    /* delay connection until syslog() */
-#define LOG_NDELAY 0x08    /* open connection immediately */
-#define LOG_NOWAIT 0x10    /* wait for child processes (unused on linux) */
-#define LOG_PERROR 0x20    /* additional logging to stderr */
+/* openlog(3) flags are currently ignored on Android. */
+#define LOG_PID    0x01
+#define LOG_CONS   0x02
+#define LOG_ODELAY 0x04
+#define LOG_NDELAY 0x08
+#define LOG_NOWAIT 0x10
+#define LOG_PERROR 0x20
 
-#define _PATH_LOG  "/dev/syslog"
-
-extern void	closelog(void);
-extern void	openlog(const char *, int, int);
-extern int	setlogmask(int);
-extern void	syslog(int, const char *, ...) __printflike(2, 3);
-extern void	vsyslog(int, const char *, va_list) __printflike(2, 0);
+void closelog(void);
+void openlog(const char*, int, int);
+int setlogmask(int);
+void syslog(int, const char*, ...) __printflike(2, 3);
+void vsyslog(int, const char*, va_list) __printflike(2, 0);
 
 __END_DECLS
 
diff --git a/ndk/platforms/android-L/include/unistd.h b/ndk/platforms/android-L/include/unistd.h
index 12e625743..7fbafdf27 100644
--- a/ndk/platforms/android-L/include/unistd.h
+++ b/ndk/platforms/android-L/include/unistd.h
@@ -170,7 +170,7 @@ extern char *optarg;
 extern int optind, opterr, optopt;
 
 extern int isatty(int);
-extern char* ttyname(int);
+extern char* ttyname(int) __warnattr("ttyname is not thread-safe; use ttyname_r instead");
 extern int ttyname_r(int, char*, size_t);
 
 extern int  acct(const char*  filepath);
@@ -189,16 +189,6 @@ extern int cacheflush(long, long, long);
 extern pid_t tcgetpgrp(int fd);
 extern int   tcsetpgrp(int fd, pid_t _pid);
 
-#if 0 /* MISSING FROM BIONIC */
-extern int execlpe(const char *, const char *, ...);
-extern int getfsuid(uid_t);
-extern int setfsuid(uid_t);
-extern int getlogin_r(char* name, size_t namesize);
-extern int sethostname(const char *, size_t);
-extern int getdomainname(char *, size_t);
-extern int setdomainname(const char *, size_t);
-#endif /* MISSING */
-
 /* Used to retry syscalls that can return EINTR. */
 #define TEMP_FAILURE_RETRY(exp) ({         \
     __typeof__(exp) _rc;                   \