diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 384d44e027ff..b1457540de81 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -17343,6 +17343,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9ea548d2
 }
+pointer_reference {
+  id: 0x2d3a0e2d
+  kind: POINTER
+  pointee_type_id: 0x9ea8de28
+}
 pointer_reference {
   id: 0x2d3a2624
   kind: POINTER
@@ -17378,6 +17383,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9ebc14d6
 }
+pointer_reference {
+  id: 0x2d3f694d
+  kind: POINTER
+  pointee_type_id: 0x9ebd43ab
+}
 pointer_reference {
   id: 0x2d3f9ded
   kind: POINTER
@@ -18153,6 +18163,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9c24e4e1
 }
+pointer_reference {
+  id: 0x2d9968fe
+  kind: POINTER
+  pointee_type_id: 0x9c254566
+}
 pointer_reference {
   id: 0x2d9ade31
   kind: POINTER
@@ -25268,6 +25283,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfea45b04
 }
+pointer_reference {
+  id: 0x353a0005
+  kind: POINTER
+  pointee_type_id: 0xfea8e688
+}
 pointer_reference {
   id: 0x353b375a
   kind: POINTER
@@ -26418,6 +26438,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xf7874bee
 }
+pointer_reference {
+  id: 0x377303ef
+  kind: POINTER
+  pointee_type_id: 0xf78ce923
+}
 pointer_reference {
   id: 0x37765a7c
   kind: POINTER
@@ -26753,6 +26778,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xcad9da82
 }
+pointer_reference {
+  id: 0x38271f7f
+  kind: POINTER
+  pointee_type_id: 0xcadc9b63
+}
 pointer_reference {
   id: 0x382837f5
   kind: POINTER
@@ -27283,6 +27313,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xcf54e4d8
 }
+pointer_reference {
+  id: 0x39465fdc
+  kind: POINTER
+  pointee_type_id: 0xcf5999ec
+}
 pointer_reference {
   id: 0x39487d35
   kind: POINTER
@@ -29523,6 +29558,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd3e2f5cd
 }
+pointer_reference {
+  id: 0x3e719038
+  kind: POINTER
+  pointee_type_id: 0xd386a67f
+}
 pointer_reference {
   id: 0x3e75499e
   kind: POINTER
@@ -29748,6 +29788,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xd1e2d78b
 }
+pointer_reference {
+  id: 0x3ee93e67
+  kind: POINTER
+  pointee_type_id: 0xd1e41f00
+}
 pointer_reference {
   id: 0x3eeac861
   kind: POINTER
@@ -33138,6 +33183,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x5a860f56
 }
+qualified {
+  id: 0xcadc9b63
+  qualifier: CONST
+  qualified_type_id: 0x5b35db07
+}
 qualified {
   id: 0xcae03949
   qualifier: CONST
@@ -33388,6 +33438,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x4b22611e
 }
+qualified {
+  id: 0xcf5999ec
+  qualifier: CONST
+  qualified_type_id: 0x4d21d13b
+}
 qualified {
   id: 0xcf611249
   qualifier: CONST
@@ -33538,6 +33593,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x37145079
 }
+qualified {
+  id: 0xd1e41f00
+  qualifier: CONST
+  qualified_type_id: 0x37d7ca8b
+}
 qualified {
   id: 0xd1f5399e
   qualifier: CONST
@@ -33638,6 +33698,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x3dacd33f
 }
+qualified {
+  id: 0xd386a67f
+  qualifier: CONST
+  qualified_type_id: 0x3e5d2f74
+}
 qualified {
   id: 0xd395c0e4
   qualifier: CONST
@@ -35673,6 +35738,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xae5a9933
 }
+qualified {
+  id: 0xf78ce923
+  qualifier: CONST
+  qualified_type_id: 0xae741204
+}
 qualified {
   id: 0xf7f069bd
   qualifier: CONST
@@ -43484,6 +43554,12 @@ member {
   type_id: 0x0baa70a7
   offset: 32
 }
+member {
+  id: 0x167a10b0
+  name: "abort"
+  type_id: 0x2d3a0e2d
+  offset: 320
+}
 member {
   id: 0x370a3acc
   name: "abort"
@@ -51630,6 +51706,12 @@ member {
   type_id: 0xdcbf4c2a
   offset: 64
 }
+member {
+  id: 0xfb49a6d7
+  name: "attr_count"
+  type_id: 0xe8034002
+  offset: 160
+}
 member {
   id: 0xa59eb82e
   name: "attr_g"
@@ -59406,6 +59488,11 @@ member {
   type_id: 0x2d4fc86f
   offset: 640
 }
+member {
+  id: 0xbe233095
+  name: "call"
+  type_id: 0x2d9968fe
+}
 member {
   id: 0x797795d3
   name: "call_ctx"
@@ -60507,6 +60594,12 @@ member {
   name: "cb"
   type_id: 0xb0d2a582
 }
+member {
+  id: 0x53c39050
+  name: "cb"
+  type_id: 0x39465fdc
+  offset: 128
+}
 member {
   id: 0x53e7b9ea
   name: "cb"
@@ -60531,6 +60624,12 @@ member {
   name: "cb_attr"
   type_id: 0x44e665d5
 }
+member {
+  id: 0x1e62d319
+  name: "cb_count"
+  type_id: 0xb3e7bac9
+  offset: 72
+}
 member {
   id: 0xd8f42eb6
   name: "cb_data"
@@ -65211,6 +65310,12 @@ member {
   type_id: 0x299c4193
   offset: 64
 }
+member {
+  id: 0xcddc96f8
+  name: "commit"
+  type_id: 0x2d3f694d
+  offset: 256
+}
 member {
   id: 0xcdfc0362
   name: "commit"
@@ -87792,6 +87897,12 @@ member {
   type_id: 0x3110588d
   offset: 8256
 }
+member {
+  id: 0x103ee0ba
+  name: "extack"
+  type_id: 0x07dcdbe1
+  offset: 256
+}
 member {
   id: 0x103ee183
   name: "extack"
@@ -136927,6 +137038,11 @@ member {
   type_id: 0x6720d32f
   offset: 64
 }
+member {
+  id: 0xaba09fa2
+  name: "nfgen_family"
+  type_id: 0xb3e7bac9
+}
 member {
   id: 0x263b9a6d
   name: "nfl_bpg_offset"
@@ -136939,6 +137055,12 @@ member {
   type_id: 0x7584e7da
   offset: 224
 }
+member {
+  id: 0x2f19098c
+  name: "nfmsg"
+  type_id: 0x377303ef
+  offset: 192
+}
 member {
   id: 0x9f1d838a
   name: "nfs"
@@ -137345,6 +137467,12 @@ member {
   type_id: 0x3bd9eb0b
   offset: 64
 }
+member {
+  id: 0xda734f0b
+  name: "nlh"
+  type_id: 0x3bd9eb0b
+  offset: 128
+}
 member {
   id: 0x069bedc0
   name: "nlhdr"
@@ -153060,6 +153188,12 @@ member {
   type_id: 0x3a40fc42
   offset: 256
 }
+member {
+  id: 0x60d35545
+  name: "policy"
+  type_id: 0x3a40fc42
+  offset: 64
+}
 member {
   id: 0x60d356d3
   name: "policy"
@@ -167770,6 +167904,12 @@ member {
   type_id: 0x33756485
   offset: 192
 }
+member {
+  id: 0x01975b31
+  name: "res_id"
+  type_id: 0x7584e7da
+  offset: 16
+}
 member {
   id: 0xa7655f29
   name: "res_table"
@@ -189312,6 +189452,12 @@ member {
   type_id: 0x1c5ceff7
   offset: 2496
 }
+member {
+  id: 0x7f586e0a
+  name: "subsys_id"
+  type_id: 0xb3e7bac9
+  offset: 64
+}
 member {
   id: 0x7f7ac96d
   name: "subsys_id"
@@ -200459,6 +200605,12 @@ member {
   type_id: 0x295c7202
   offset: 3208
 }
+member {
+  id: 0x5c7febb9
+  name: "type"
+  type_id: 0x293705d2
+  offset: 128
+}
 member {
   id: 0x5c839712
   name: "type"
@@ -205692,6 +205844,12 @@ member {
   name: "valid"
   type_id: 0x26554526
 }
+member {
+  id: 0x036a906a
+  name: "valid_genid"
+  type_id: 0x353a0005
+  offset: 384
+}
 member {
   id: 0xa6274290
   name: "valid_ioctls"
@@ -249744,6 +249902,60 @@ struct_union {
     member_id: 0xd905c561
   }
 }
+struct_union {
+  id: 0xae741204
+  kind: STRUCT
+  name: "nfgenmsg"
+  definition {
+    bytesize: 4
+    member_id: 0xaba09fa2
+    member_id: 0xa6d2d826
+    member_id: 0x01975b31
+  }
+}
+struct_union {
+  id: 0x5b35db07
+  kind: STRUCT
+  name: "nfnetlink_subsystem"
+  definition {
+    bytesize: 64
+    member_id: 0x0de57ce8
+    member_id: 0x7f586e0a
+    member_id: 0x1e62d319
+    member_id: 0x53c39050
+    member_id: 0x4a965a99
+    member_id: 0xcddc96f8
+    member_id: 0x167a10b0
+    member_id: 0x036a906a
+    member_id: 0x2d081245
+  }
+}
+struct_union {
+  id: 0x4d21d13b
+  kind: STRUCT
+  name: "nfnl_callback"
+  definition {
+    bytesize: 32
+    member_id: 0xbe233095
+    member_id: 0x60d35545
+    member_id: 0x5c7febb9
+    member_id: 0xfb49a6d7
+    member_id: 0x2d081dfb
+  }
+}
+struct_union {
+  id: 0x3e5d2f74
+  kind: STRUCT
+  name: "nfnl_info"
+  definition {
+    bytesize: 40
+    member_id: 0x7203ed5f
+    member_id: 0x828c8d54
+    member_id: 0xda734f0b
+    member_id: 0x2f19098c
+    member_id: 0x103ee0ba
+  }
+}
 struct_union {
   id: 0x5d26223d
   kind: STRUCT
@@ -286817,6 +287029,46 @@ enumeration {
     }
   }
 }
+enumeration {
+  id: 0x56760d43
+  name: "nfnl_abort_action"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "NFNL_ABORT_NONE"
+    }
+    enumerator {
+      name: "NFNL_ABORT_AUTOLOAD"
+      value: 1
+    }
+    enumerator {
+      name: "NFNL_ABORT_VALIDATE"
+      value: 2
+    }
+  }
+}
+enumeration {
+  id: 0x293705d2
+  name: "nfnl_callback_type"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "NFNL_CB_UNSPEC"
+    }
+    enumerator {
+      name: "NFNL_CB_MUTEX"
+      value: 1
+    }
+    enumerator {
+      name: "NFNL_CB_RCU"
+      value: 2
+    }
+    enumerator {
+      name: "NFNL_CB_BATCH"
+      value: 3
+    }
+  }
+}
 enumeration {
   id: 0xa28f9420
   name: "nl80211_band"
@@ -297798,6 +298050,12 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x0d5f1839
 }
+function {
+  id: 0x13d009d7
+  return_type_id: 0x48b5725f
+  parameter_id: 0x09793771
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x13d261bc
   return_type_id: 0x48b5725f
@@ -307908,6 +308166,11 @@ function {
   return_type_id: 0x33756485
   parameter_id: 0x37b4f743
 }
+function {
+  id: 0x3c61bf21
+  return_type_id: 0x48b5725f
+  parameter_id: 0xb3e7bac9
+}
 function {
   id: 0x3c97e3d9
   return_type_id: 0x33756485
@@ -317991,6 +318254,11 @@ function {
   parameter_id: 0x38aab014
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x938924f0
+  return_type_id: 0x6720d32f
+  parameter_id: 0x38271f7f
+}
 function {
   id: 0x93898074
   return_type_id: 0x6720d32f
@@ -330500,6 +330768,13 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x9c254566
+  return_type_id: 0x6720d32f
+  parameter_id: 0x054f691a
+  parameter_id: 0x3e719038
+  parameter_id: 0x3ee93e67
+}
 function {
   id: 0x9c2b054b
   return_type_id: 0x6720d32f
@@ -334897,6 +335172,13 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x0ca27481
 }
+function {
+  id: 0x9ea8de28
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x054f691a
+  parameter_id: 0x56760d43
+}
 function {
   id: 0x9eb16478
   return_type_id: 0x6720d32f
@@ -334953,6 +335235,12 @@ function {
   parameter_id: 0x0e6618c4
   parameter_id: 0x295c7202
 }
+function {
+  id: 0x9ebd43ab
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x054f691a
+}
 function {
   id: 0x9ebe912b
   return_type_id: 0x6720d32f
@@ -334999,6 +335287,12 @@ function {
   parameter_id: 0x1bb6a471
   parameter_id: 0x07dcdbe1
 }
+function {
+  id: 0x9ec8bb6b
+  return_type_id: 0x6720d32f
+  parameter_id: 0x09793771
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x9ec960c7
   return_type_id: 0x6720d32f
@@ -341795,6 +342089,12 @@ function {
   id: 0xfea45b04
   return_type_id: 0x6d7f5ff6
 }
+function {
+  id: 0xfea8e688
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x0ca27481
+  parameter_id: 0xc9082b19
+}
 function {
   id: 0xfebe0504
   return_type_id: 0x6d7f5ff6
@@ -388271,6 +388571,51 @@ elf_symbol {
   type_id: 0x9cd33969
   full_name: "nfc_vendor_cmd_reply"
 }
+elf_symbol {
+  id: 0x676923d3
+  name: "nfnetlink_subsys_register"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3b9a7b91
+  type_id: 0x938924f0
+  full_name: "nfnetlink_subsys_register"
+}
+elf_symbol {
+  id: 0xc0c6c63a
+  name: "nfnetlink_subsys_unregister"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa2987a00
+  type_id: 0x938924f0
+  full_name: "nfnetlink_subsys_unregister"
+}
+elf_symbol {
+  id: 0xce121652
+  name: "nfnetlink_unicast"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x61236c92
+  type_id: 0x9cd3f2b1
+  full_name: "nfnetlink_unicast"
+}
+elf_symbol {
+  id: 0x3c10aa1e
+  name: "nfnl_lock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5ce3b588
+  type_id: 0x3c61bf21
+  full_name: "nfnl_lock"
+}
+elf_symbol {
+  id: 0x4b91041f
+  name: "nfnl_unlock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdb065657
+  type_id: 0x3c61bf21
+  full_name: "nfnl_unlock"
+}
 elf_symbol {
   id: 0x6aeef72a
   name: "nla_append"
@@ -417105,6 +417450,15 @@ elf_symbol {
   type_id: 0x9fdeaef3
   full_name: "xt_register_match"
 }
+elf_symbol {
+  id: 0xa7a837dd
+  name: "xt_register_matches"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xbaed6f01
+  type_id: 0x9ec8bb6b
+  full_name: "xt_register_matches"
+}
 elf_symbol {
   id: 0xb2fbe60e
   name: "xt_register_target"
@@ -417150,6 +417504,15 @@ elf_symbol {
   type_id: 0x12c61c4f
   full_name: "xt_unregister_match"
 }
+elf_symbol {
+  id: 0xa7e146e8
+  name: "xt_unregister_matches"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x58c97d7f
+  type_id: 0x13d009d7
+  full_name: "xt_unregister_matches"
+}
 elf_symbol {
   id: 0x15f1eb71
   name: "xt_unregister_target"
@@ -422521,6 +422884,11 @@ interface {
   symbol_id: 0x22e68369
   symbol_id: 0xefd6be85
   symbol_id: 0x53dde8dc
+  symbol_id: 0x676923d3
+  symbol_id: 0xc0c6c63a
+  symbol_id: 0xce121652
+  symbol_id: 0x3c10aa1e
+  symbol_id: 0x4b91041f
   symbol_id: 0x6aeef72a
   symbol_id: 0x915620e9
   symbol_id: 0x1570bf50
@@ -425725,11 +426093,13 @@ interface {
   symbol_id: 0x8eb67e0f
   symbol_id: 0xf6d0be30
   symbol_id: 0x7a3f2cd6
+  symbol_id: 0xa7a837dd
   symbol_id: 0xb2fbe60e
   symbol_id: 0x450f3768
   symbol_id: 0xffcb0fa2
   symbol_id: 0xa2ee5f12
   symbol_id: 0x807b9318
+  symbol_id: 0xa7e146e8
   symbol_id: 0x15f1eb71
   symbol_id: 0x7c598ee8
   symbol_id: 0x2407d2bf
diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk
index d4be95cc43af..46313f2a6297 100644
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -1720,6 +1720,11 @@
   net_selftest_get_count
   net_selftest_get_strings
   nf_conntrack_destroy
+  nfnetlink_subsys_register
+  nfnetlink_subsys_unregister
+  nfnetlink_unicast
+  nfnl_lock
+  nfnl_unlock
   nf_register_net_hooks
   nf_unregister_net_hooks
   nla_find
@@ -3569,6 +3574,8 @@
   xsk_tx_peek_desc
   xsk_tx_release
   xsk_uses_need_wakeup
+  xt_register_matches
+  xt_unregister_matches
   zlib_deflate
   zlib_deflateEnd
   zlib_deflateInit2