diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 8bf78501f24c..9052b3d7eb8e 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -35252,11 +35252,6 @@ member {
   id: 0x20748443
   type_id: 0x0efc611f
 }
-member {
-  id: 0x2082f479
-  type_id: 0x0d25bd0f
-  offset: 11520
-}
 member {
   id: 0x2098ac9a
   type_id: 0x0d4ccc92
@@ -35458,6 +35453,11 @@ member {
   id: 0x27e3d457
   type_id: 0x10a1214c
 }
+member {
+  id: 0x28012bb9
+  type_id: 0x2f2ac20c
+  offset: 11520
+}
 member {
   id: 0x28026f1f
   type_id: 0x2f27cc6c
@@ -77958,10 +77958,10 @@ member {
   offset: 576
 }
 member {
-  id: 0xcbce1938
+  id: 0xcbce1148
   name: "exit_work"
   type_id: 0x1f3c8679
-  offset: 1408
+  offset: 1344
 }
 member {
   id: 0x154265da
@@ -79011,10 +79011,10 @@ member {
   offset: 10248
 }
 member {
-  id: 0x2bc8fdc9
+  id: 0x2bc8f5ab
   name: "fallback_llist"
   type_id: 0x0bf3e543
-  offset: 256
+  offset: 192
 }
 member {
   id: 0x1e0adfa4
@@ -79022,10 +79022,10 @@ member {
   type_id: 0x214d9bc0
 }
 member {
-  id: 0xfa3ad6ea
+  id: 0xfa3ad186
   name: "fallback_work"
   type_id: 0xf1159c31
-  offset: 320
+  offset: 256
 }
 member {
   id: 0x5261bd5a
@@ -90795,10 +90795,9 @@ member {
   type_id: 0x92233392
 }
 member {
-  id: 0xdd1ec771
+  id: 0xdd1ec390
   name: "hash_map"
   type_id: 0x3e2fe44b
-  offset: 64
 }
 member {
   id: 0xa31ad885
@@ -100415,16 +100414,16 @@ member {
   offset: 320
 }
 member {
-  id: 0x3dd488c8
+  id: 0x3dd48315
   name: "iowq_limits"
   type_id: 0x5eeb4a25
-  offset: 2176
+  offset: 2112
 }
 member {
-  id: 0x15478239
+  id: 0x15478e55
   name: "iowq_limits_set"
   type_id: 0x6d7f5ff6
-  offset: 2240
+  offset: 2176
 }
 member {
   id: 0xd364d156
@@ -116588,10 +116587,10 @@ member {
   offset: 11328
 }
 member {
-  id: 0xf2c3c54a
+  id: 0xf2c3c441
   name: "mm_account"
   type_id: 0x1b36c7a2
-  offset: 192
+  offset: 128
 }
 member {
   id: 0x8a013cf5
@@ -147381,10 +147380,10 @@ member {
   offset: 1728
 }
 member {
-  id: 0x859f0dbd
+  id: 0x859f077e
   name: "ref_comp"
   type_id: 0x3fcbf304
-  offset: 1920
+  offset: 1856
 }
 member {
   id: 0x53e1405b
@@ -152753,11 +152752,6 @@ member {
   type_id: 0x4585663f
   offset: 864
 }
-member {
-  id: 0x55fafd4f
-  name: "ring_sock"
-  type_id: 0x106029c6
-}
 member {
   id: 0x7633aeb9
   name: "rings"
@@ -173892,10 +173886,10 @@ member {
   offset: 256
 }
 member {
-  id: 0x3660523a
+  id: 0x3660536c
   name: "tctx_list"
   type_id: 0xd3c80119
-  offset: 1792
+  offset: 1728
 }
 member {
   id: 0x43a6cfb9
@@ -183445,18 +183439,18 @@ member {
   type_id: 0x181ee594
   offset: 1408
 }
+member {
+  id: 0x042a2402
+  name: "user"
+  type_id: 0x181ee594
+  offset: 64
+}
 member {
   id: 0x042a27fc
   name: "user"
   type_id: 0x181ee594
   offset: 1024
 }
-member {
-  id: 0x042a2921
-  name: "user"
-  type_id: 0x181ee594
-  offset: 128
-}
 member {
   id: 0x042a2c60
   name: "user"
@@ -192029,24 +192023,6 @@ struct_union {
     member_id: 0xadaeae8c
   }
 }
-struct_union {
-  id: 0x0d25bd0f
-  kind: STRUCT
-  definition {
-    bytesize: 288
-    member_id: 0x55fafd4f
-    member_id: 0xdd1ec771
-    member_id: 0x042a2921
-    member_id: 0xf2c3c54a
-    member_id: 0x2bc8fdc9
-    member_id: 0xfa3ad6ea
-    member_id: 0xcbce1938
-    member_id: 0x3660523a
-    member_id: 0x859f0dbd
-    member_id: 0x3dd488c8
-    member_id: 0x15478239
-  }
-}
 struct_union {
   id: 0x0d2844e8
   kind: STRUCT
@@ -193791,6 +193767,23 @@ struct_union {
     member_id: 0x6ec6b7fe
   }
 }
+struct_union {
+  id: 0x2f2ac20c
+  kind: STRUCT
+  definition {
+    bytesize: 280
+    member_id: 0xdd1ec390
+    member_id: 0x042a2402
+    member_id: 0xf2c3c441
+    member_id: 0x2bc8f5ab
+    member_id: 0xfa3ad186
+    member_id: 0xcbce1148
+    member_id: 0x3660536c
+    member_id: 0x859f077e
+    member_id: 0x3dd48315
+    member_id: 0x15478e55
+  }
+}
 struct_union {
   id: 0x2f802e01
   kind: STRUCT
@@ -215935,7 +215928,7 @@ struct_union {
     member_id: 0x296b856d
     member_id: 0x5c36e689
     member_id: 0x22694cf6
-    member_id: 0x2082f479
+    member_id: 0x28012bb9
   }
 }
 struct_union {