diff --git a/ndk-sys/Cargo.toml b/ndk-sys/Cargo.toml
index 29eaecbc..83c4528c 100644
--- a/ndk-sys/Cargo.toml
+++ b/ndk-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ndk-sys"
-version = "0.6.0+12211873"
+version = "0.6.0+12313732"
 authors = ["The Rust Windowing contributors"]
 edition = "2021"
 description = "FFI bindings for the Android NDK"
diff --git a/ndk-sys/src/ffi_aarch64.rs b/ndk-sys/src/ffi_aarch64.rs
index 0b3bf709..a577ae2d 100644
--- a/ndk-sys/src/ffi_aarch64.rs
+++ b/ndk-sys/src/ffi_aarch64.rs
@@ -1157,6 +1157,7 @@ pub const SS_FLAG_BITS: u32 = 2147483648;
 pub const _NSIG: u32 = 65;
 pub const NSIG: u32 = 65;
 pub const NGREG: u32 = 34;
+pub const SIG2STR_MAX: u32 = 32;
 pub const FD_SETSIZE: u32 = 1024;
 pub const F_ULOCK: u32 = 0;
 pub const F_LOCK: u32 = 1;
@@ -5876,34 +5877,6 @@ extern "C" {
         __flags: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn strtol(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn strtoll(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_longlong;
-}
-extern "C" {
-    pub fn strtoul(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn strtoull(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulonglong;
-}
 extern "C" {
     pub fn posix_memalign(
         __memptr: *mut *mut ::std::os::raw::c_void,
@@ -5917,35 +5890,6 @@ extern "C" {
         __size: ::std::os::raw::c_ulong,
     ) -> *mut ::std::os::raw::c_void;
 }
-extern "C" {
-    pub fn strtod(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtold(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> u128;
-}
-extern "C" {
-    pub fn strtoul_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
-}
 extern "C" {
     pub fn realpath(
         __path: *const ::std::os::raw::c_char,
@@ -6165,15 +6109,6 @@ extern "C" {
 extern "C" {
     pub fn llabs(__x: ::std::os::raw::c_longlong) -> ::std::os::raw::c_longlong;
 }
-extern "C" {
-    pub fn strtof(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f32;
-}
-extern "C" {
-    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
-}
 extern "C" {
     pub fn rand() -> ::std::os::raw::c_int;
 }
@@ -6189,6 +6124,32 @@ extern "C" {
 extern "C" {
     pub fn grantpt(__fd: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
+}
+extern "C" {
+    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
+}
+extern "C" {
+    pub fn strtol(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn strtoll(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_longlong;
+}
 extern "C" {
     pub fn strtoll_l(
         __s: *const ::std::os::raw::c_char,
@@ -6197,6 +6158,20 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_longlong;
 }
+extern "C" {
+    pub fn strtoul(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulong;
+}
+extern "C" {
+    pub fn strtoull(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulonglong;
+}
 extern "C" {
     pub fn strtoull_l(
         __s: *const ::std::os::raw::c_char,
@@ -6205,6 +6180,24 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_ulonglong;
 }
+extern "C" {
+    pub fn strtof(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f32;
+}
+extern "C" {
+    pub fn strtod(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f64;
+}
+extern "C" {
+    pub fn strtold(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> u128;
+}
 extern "C" {
     pub fn strtold_l(
         __s: *const ::std::os::raw::c_char,
@@ -6226,14 +6219,6 @@ extern "C" {
         __l: locale_t,
     ) -> f32;
 }
-extern "C" {
-    pub fn strtol_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        arg1: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_long;
-}
 pub type net_handle_t = u64;
 extern "C" {
     pub fn android_setsocknetwork(
@@ -8821,6 +8806,18 @@ extern "C" {
     pub fn sigwaitinfo64(__set: *const sigset64_t, __info: *mut siginfo_t)
         -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sig2str(
+        __signal: ::std::os::raw::c_int,
+        __buf: *mut ::std::os::raw::c_char,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn str2sig(
+        __name: *const ::std::os::raw::c_char,
+        __signal: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -11153,12 +11150,6 @@ extern "C" {
 extern "C" {
     pub fn strerror(__errno_value: ::std::os::raw::c_int) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strerror_l(
-        __errno_value: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strerror_r(
         __errno_value: ::std::os::raw::c_int,
@@ -11673,14 +11664,6 @@ extern "C" {
         __tm: *mut tm,
     ) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strptime_l(
-        __s: *const ::std::os::raw::c_char,
-        __fmt: *const ::std::os::raw::c_char,
-        __tm: *mut tm,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
diff --git a/ndk-sys/src/ffi_arm.rs b/ndk-sys/src/ffi_arm.rs
index 2298f293..fbb9cc4f 100644
--- a/ndk-sys/src/ffi_arm.rs
+++ b/ndk-sys/src/ffi_arm.rs
@@ -1164,6 +1164,7 @@ pub const NSIG: u32 = 65;
 pub const PAGE_SIZE: u32 = 4096;
 pub const PAGE_MASK: i32 = -4096;
 pub const NGREG: u32 = 18;
+pub const SIG2STR_MAX: u32 = 32;
 pub const FD_SETSIZE: u32 = 1024;
 pub const F_ULOCK: u32 = 0;
 pub const F_LOCK: u32 = 1;
@@ -5868,34 +5869,6 @@ extern "C" {
         __flags: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn strtol(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn strtoll(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_longlong;
-}
-extern "C" {
-    pub fn strtoul(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn strtoull(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulonglong;
-}
 extern "C" {
     pub fn posix_memalign(
         __memptr: *mut *mut ::std::os::raw::c_void,
@@ -5909,35 +5882,6 @@ extern "C" {
         __size: ::std::os::raw::c_uint,
     ) -> *mut ::std::os::raw::c_void;
 }
-extern "C" {
-    pub fn strtod(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtold(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtoul_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
-}
 extern "C" {
     pub fn realpath(
         __path: *const ::std::os::raw::c_char,
@@ -6157,15 +6101,6 @@ extern "C" {
 extern "C" {
     pub fn llabs(__x: ::std::os::raw::c_longlong) -> ::std::os::raw::c_longlong;
 }
-extern "C" {
-    pub fn strtof(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f32;
-}
-extern "C" {
-    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
-}
 extern "C" {
     pub fn rand() -> ::std::os::raw::c_int;
 }
@@ -6181,6 +6116,32 @@ extern "C" {
 extern "C" {
     pub fn grantpt(__fd: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
+}
+extern "C" {
+    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
+}
+extern "C" {
+    pub fn strtol(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn strtoll(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_longlong;
+}
 extern "C" {
     pub fn strtoll_l(
         __s: *const ::std::os::raw::c_char,
@@ -6189,6 +6150,20 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_longlong;
 }
+extern "C" {
+    pub fn strtoul(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulong;
+}
+extern "C" {
+    pub fn strtoull(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulonglong;
+}
 extern "C" {
     pub fn strtoull_l(
         __s: *const ::std::os::raw::c_char,
@@ -6198,33 +6173,43 @@ extern "C" {
     ) -> ::std::os::raw::c_ulonglong;
 }
 extern "C" {
-    pub fn strtold_l(
+    pub fn strtof(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f32;
+}
+extern "C" {
+    pub fn strtod(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __l: locale_t,
     ) -> f64;
 }
 extern "C" {
-    pub fn strtod_l(
+    pub fn strtold(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f64;
+}
+extern "C" {
+    pub fn strtold_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
         __l: locale_t,
     ) -> f64;
 }
 extern "C" {
-    pub fn strtof_l(
+    pub fn strtod_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
         __l: locale_t,
-    ) -> f32;
+    ) -> f64;
 }
 extern "C" {
-    pub fn strtol_l(
+    pub fn strtof_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
-        arg1: ::std::os::raw::c_int,
         __l: locale_t,
-    ) -> ::std::os::raw::c_long;
+    ) -> f32;
 }
 pub type net_handle_t = u64;
 extern "C" {
@@ -8985,6 +8970,18 @@ extern "C" {
     pub fn sigwaitinfo64(__set: *const sigset64_t, __info: *mut siginfo_t)
         -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sig2str(
+        __signal: ::std::os::raw::c_int,
+        __buf: *mut ::std::os::raw::c_char,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn str2sig(
+        __name: *const ::std::os::raw::c_char,
+        __signal: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -11324,12 +11321,6 @@ extern "C" {
 extern "C" {
     pub fn strerror(__errno_value: ::std::os::raw::c_int) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strerror_l(
-        __errno_value: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strerror_r(
         __errno_value: ::std::os::raw::c_int,
@@ -11844,14 +11835,6 @@ extern "C" {
         __tm: *mut tm,
     ) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strptime_l(
-        __s: *const ::std::os::raw::c_char,
-        __fmt: *const ::std::os::raw::c_char,
-        __tm: *mut tm,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
diff --git a/ndk-sys/src/ffi_i686.rs b/ndk-sys/src/ffi_i686.rs
index 35c3438f..90b96687 100644
--- a/ndk-sys/src/ffi_i686.rs
+++ b/ndk-sys/src/ffi_i686.rs
@@ -1085,6 +1085,7 @@ pub const NSIG: u32 = 65;
 pub const PAGE_SIZE: u32 = 4096;
 pub const PAGE_MASK: i32 = -4096;
 pub const UPAGES: u32 = 1;
+pub const SIG2STR_MAX: u32 = 32;
 pub const FD_SETSIZE: u32 = 1024;
 pub const F_ULOCK: u32 = 0;
 pub const F_LOCK: u32 = 1;
@@ -5796,34 +5797,6 @@ extern "C" {
         __flags: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn strtol(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn strtoll(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_longlong;
-}
-extern "C" {
-    pub fn strtoul(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn strtoull(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulonglong;
-}
 extern "C" {
     pub fn posix_memalign(
         __memptr: *mut *mut ::std::os::raw::c_void,
@@ -5837,35 +5810,6 @@ extern "C" {
         __size: ::std::os::raw::c_uint,
     ) -> *mut ::std::os::raw::c_void;
 }
-extern "C" {
-    pub fn strtod(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtold(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtoul_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
-}
 extern "C" {
     pub fn realpath(
         __path: *const ::std::os::raw::c_char,
@@ -6085,15 +6029,6 @@ extern "C" {
 extern "C" {
     pub fn llabs(__x: ::std::os::raw::c_longlong) -> ::std::os::raw::c_longlong;
 }
-extern "C" {
-    pub fn strtof(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f32;
-}
-extern "C" {
-    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
-}
 extern "C" {
     pub fn rand() -> ::std::os::raw::c_int;
 }
@@ -6109,6 +6044,32 @@ extern "C" {
 extern "C" {
     pub fn grantpt(__fd: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
+}
+extern "C" {
+    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
+}
+extern "C" {
+    pub fn strtol(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn strtoll(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_longlong;
+}
 extern "C" {
     pub fn strtoll_l(
         __s: *const ::std::os::raw::c_char,
@@ -6117,6 +6078,20 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_longlong;
 }
+extern "C" {
+    pub fn strtoul(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulong;
+}
+extern "C" {
+    pub fn strtoull(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulonglong;
+}
 extern "C" {
     pub fn strtoull_l(
         __s: *const ::std::os::raw::c_char,
@@ -6126,33 +6101,43 @@ extern "C" {
     ) -> ::std::os::raw::c_ulonglong;
 }
 extern "C" {
-    pub fn strtold_l(
+    pub fn strtof(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f32;
+}
+extern "C" {
+    pub fn strtod(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __l: locale_t,
     ) -> f64;
 }
 extern "C" {
-    pub fn strtod_l(
+    pub fn strtold(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f64;
+}
+extern "C" {
+    pub fn strtold_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
         __l: locale_t,
     ) -> f64;
 }
 extern "C" {
-    pub fn strtof_l(
+    pub fn strtod_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
         __l: locale_t,
-    ) -> f32;
+    ) -> f64;
 }
 extern "C" {
-    pub fn strtol_l(
+    pub fn strtof_l(
         __s: *const ::std::os::raw::c_char,
         __end_ptr: *mut *mut ::std::os::raw::c_char,
-        arg1: ::std::os::raw::c_int,
         __l: locale_t,
-    ) -> ::std::os::raw::c_long;
+    ) -> f32;
 }
 pub type net_handle_t = u64;
 extern "C" {
@@ -9286,6 +9271,18 @@ extern "C" {
     pub fn sigwaitinfo64(__set: *const sigset64_t, __info: *mut siginfo_t)
         -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sig2str(
+        __signal: ::std::os::raw::c_int,
+        __buf: *mut ::std::os::raw::c_char,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn str2sig(
+        __name: *const ::std::os::raw::c_char,
+        __signal: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -11618,12 +11615,6 @@ extern "C" {
 extern "C" {
     pub fn strerror(__errno_value: ::std::os::raw::c_int) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strerror_l(
-        __errno_value: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strerror_r(
         __errno_value: ::std::os::raw::c_int,
@@ -12138,14 +12129,6 @@ extern "C" {
         __tm: *mut tm,
     ) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strptime_l(
-        __s: *const ::std::os::raw::c_char,
-        __fmt: *const ::std::os::raw::c_char,
-        __tm: *mut tm,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,
diff --git a/ndk-sys/src/ffi_x86_64.rs b/ndk-sys/src/ffi_x86_64.rs
index 836acd24..378bf587 100644
--- a/ndk-sys/src/ffi_x86_64.rs
+++ b/ndk-sys/src/ffi_x86_64.rs
@@ -1130,6 +1130,7 @@ pub const SS_FLAG_BITS: u32 = 2147483648;
 pub const _KERNEL__NSIG: u32 = 64;
 pub const _NSIG: u32 = 65;
 pub const NSIG: u32 = 65;
+pub const SIG2STR_MAX: u32 = 32;
 pub const FD_SETSIZE: u32 = 1024;
 pub const F_ULOCK: u32 = 0;
 pub const F_LOCK: u32 = 1;
@@ -5847,34 +5848,6 @@ extern "C" {
         __flags: ::std::os::raw::c_int,
     ) -> ::std::os::raw::c_int;
 }
-extern "C" {
-    pub fn strtol(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn strtoll(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_longlong;
-}
-extern "C" {
-    pub fn strtoul(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn strtoull(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-    ) -> ::std::os::raw::c_ulonglong;
-}
 extern "C" {
     pub fn posix_memalign(
         __memptr: *mut *mut ::std::os::raw::c_void,
@@ -5888,35 +5861,6 @@ extern "C" {
         __size: ::std::os::raw::c_ulong,
     ) -> *mut ::std::os::raw::c_void;
 }
-extern "C" {
-    pub fn strtod(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f64;
-}
-extern "C" {
-    pub fn strtold(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> u128;
-}
-extern "C" {
-    pub fn strtoul_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        __base: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_ulong;
-}
-extern "C" {
-    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
-}
-extern "C" {
-    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
-}
-extern "C" {
-    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
-}
 extern "C" {
     pub fn realpath(
         __path: *const ::std::os::raw::c_char,
@@ -6136,15 +6080,6 @@ extern "C" {
 extern "C" {
     pub fn llabs(__x: ::std::os::raw::c_longlong) -> ::std::os::raw::c_longlong;
 }
-extern "C" {
-    pub fn strtof(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-    ) -> f32;
-}
-extern "C" {
-    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
-}
 extern "C" {
     pub fn rand() -> ::std::os::raw::c_int;
 }
@@ -6160,6 +6095,32 @@ extern "C" {
 extern "C" {
     pub fn grantpt(__fd: ::std::os::raw::c_int) -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn atof(__s: *const ::std::os::raw::c_char) -> f64;
+}
+extern "C" {
+    pub fn atoi(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn atol(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn atoll(__s: *const ::std::os::raw::c_char) -> ::std::os::raw::c_longlong;
+}
+extern "C" {
+    pub fn strtol(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_long;
+}
+extern "C" {
+    pub fn strtoll(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_longlong;
+}
 extern "C" {
     pub fn strtoll_l(
         __s: *const ::std::os::raw::c_char,
@@ -6168,6 +6129,20 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_longlong;
 }
+extern "C" {
+    pub fn strtoul(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulong;
+}
+extern "C" {
+    pub fn strtoull(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+        __base: ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_ulonglong;
+}
 extern "C" {
     pub fn strtoull_l(
         __s: *const ::std::os::raw::c_char,
@@ -6176,6 +6151,24 @@ extern "C" {
         __l: locale_t,
     ) -> ::std::os::raw::c_ulonglong;
 }
+extern "C" {
+    pub fn strtof(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f32;
+}
+extern "C" {
+    pub fn strtod(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> f64;
+}
+extern "C" {
+    pub fn strtold(
+        __s: *const ::std::os::raw::c_char,
+        __end_ptr: *mut *mut ::std::os::raw::c_char,
+    ) -> u128;
+}
 extern "C" {
     pub fn strtold_l(
         __s: *const ::std::os::raw::c_char,
@@ -6197,14 +6190,6 @@ extern "C" {
         __l: locale_t,
     ) -> f32;
 }
-extern "C" {
-    pub fn strtol_l(
-        __s: *const ::std::os::raw::c_char,
-        __end_ptr: *mut *mut ::std::os::raw::c_char,
-        arg1: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> ::std::os::raw::c_long;
-}
 pub type net_handle_t = u64;
 extern "C" {
     pub fn android_setsocknetwork(
@@ -9326,6 +9311,18 @@ extern "C" {
     pub fn sigwaitinfo64(__set: *const sigset64_t, __info: *mut siginfo_t)
         -> ::std::os::raw::c_int;
 }
+extern "C" {
+    pub fn sig2str(
+        __signal: ::std::os::raw::c_int,
+        __buf: *mut ::std::os::raw::c_char,
+    ) -> ::std::os::raw::c_int;
+}
+extern "C" {
+    pub fn str2sig(
+        __name: *const ::std::os::raw::c_char,
+        __signal: *mut ::std::os::raw::c_int,
+    ) -> ::std::os::raw::c_int;
+}
 pub type fd_mask = ::std::os::raw::c_ulong;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -11658,12 +11655,6 @@ extern "C" {
 extern "C" {
     pub fn strerror(__errno_value: ::std::os::raw::c_int) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strerror_l(
-        __errno_value: ::std::os::raw::c_int,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strerror_r(
         __errno_value: ::std::os::raw::c_int,
@@ -12178,14 +12169,6 @@ extern "C" {
         __tm: *mut tm,
     ) -> *mut ::std::os::raw::c_char;
 }
-extern "C" {
-    pub fn strptime_l(
-        __s: *const ::std::os::raw::c_char,
-        __fmt: *const ::std::os::raw::c_char,
-        __tm: *mut tm,
-        __l: locale_t,
-    ) -> *mut ::std::os::raw::c_char;
-}
 extern "C" {
     pub fn strftime(
         __buf: *mut ::std::os::raw::c_char,