diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 6be4e52b1610..10ca10afffa0 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -8678,6 +8678,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x64da9c42
 }
+pointer_reference {
+  id: 0x13b72e31
+  kind: POINTER
+  pointee_type_id: 0x649c5e5b
+}
 pointer_reference {
   id: 0x13b93798
   kind: POINTER
@@ -14358,6 +14363,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9ab9a458
 }
+pointer_reference {
+  id: 0x2c3e6eed
+  kind: POINTER
+  pointee_type_id: 0x9ab95d2b
+}
 pointer_reference {
   id: 0x2c3f2dba
   kind: POINTER
@@ -15808,6 +15818,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x98c71afc
 }
+pointer_reference {
+  id: 0x2ca5fa72
+  kind: POINTER
+  pointee_type_id: 0x98d70f54
+}
 pointer_reference {
   id: 0x2ca6a571
   kind: POINTER
@@ -20088,6 +20103,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x902e10a9
 }
+pointer_reference {
+  id: 0x2e9c2274
+  kind: POINTER
+  pointee_type_id: 0x90306f4f
+}
 pointer_reference {
   id: 0x2e9e4338
   kind: POINTER
@@ -20673,6 +20693,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x91c118ea
 }
+pointer_reference {
+  id: 0x2ee092c5
+  kind: POINTER
+  pointee_type_id: 0x91c2ad89
+}
 pointer_reference {
   id: 0x2ee126d9
   kind: POINTER
@@ -20903,6 +20928,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9185daf6
 }
+pointer_reference {
+  id: 0x2ef15d2b
+  kind: POINTER
+  pointee_type_id: 0x91859230
+}
 pointer_reference {
   id: 0x2ef22e9f
   kind: POINTER
@@ -21203,6 +21233,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9636894a
 }
+pointer_reference {
+  id: 0x2f1dff77
+  kind: POINTER
+  pointee_type_id: 0x96371b41
+}
 pointer_reference {
   id: 0x2f1f19f7
   kind: POINTER
@@ -21233,6 +21268,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x96c7ba5c
 }
+pointer_reference {
+  id: 0x2f22286c
+  kind: POINTER
+  pointee_type_id: 0x96c8472d
+}
 pointer_reference {
   id: 0x2f2278cb
   kind: POINTER
@@ -21343,6 +21383,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x968ac51c
 }
+pointer_reference {
+  id: 0x2f33e782
+  kind: POINTER
+  pointee_type_id: 0x968f7894
+}
 pointer_reference {
   id: 0x2f36a854
   kind: POINTER
@@ -21508,6 +21553,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9710bae0
 }
+pointer_reference {
+  id: 0x2f5626de
+  kind: POINTER
+  pointee_type_id: 0x97187de5
+}
 pointer_reference {
   id: 0x2f575961
   kind: POINTER
@@ -21543,11 +21593,21 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x9735a176
 }
+pointer_reference {
+  id: 0x2f5de562
+  kind: POINTER
+  pointee_type_id: 0x97377314
+}
 pointer_reference {
   id: 0x2f5e345a
   kind: POINTER
   pointee_type_id: 0x973837f7
 }
+pointer_reference {
+  id: 0x2f5e98dd
+  kind: POINTER
+  pointee_type_id: 0x973a85eb
+}
 pointer_reference {
   id: 0x2f5ea9dc
   kind: POINTER
@@ -22548,6 +22608,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xea7f94f9
 }
+pointer_reference {
+  id: 0x3015c47d
+  kind: POINTER
+  pointee_type_id: 0xea17f769
+}
 pointer_reference {
   id: 0x3017223b
   kind: POINTER
@@ -23148,6 +23213,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xefa4cae6
 }
+pointer_reference {
+  id: 0x317fb103
+  kind: POINTER
+  pointee_type_id: 0xefbe2291
+}
 pointer_reference {
   id: 0x3181aee5
   kind: POINTER
@@ -25173,6 +25243,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xfc8f4f95
 }
+pointer_reference {
+  id: 0x35b4b910
+  kind: POINTER
+  pointee_type_id: 0xfc9202dd
+}
 pointer_reference {
   id: 0x35bad1e5
   kind: POINTER
@@ -27988,6 +28063,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xc538e39d
 }
+pointer_reference {
+  id: 0x3be1e049
+  kind: POINTER
+  pointee_type_id: 0xc5c767b8
+}
 pointer_reference {
   id: 0x3be4ec15
   kind: POINTER
@@ -32333,6 +32413,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x6682a341
 }
+qualified {
+  id: 0xc5c767b8
+  qualifier: CONST
+  qualified_type_id: 0x675a2868
+}
 qualified {
   id: 0xc5d356cb
   qualifier: CONST
@@ -34733,6 +34818,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xcd7704bf
 }
+qualified {
+  id: 0xefbe2291
+  qualifier: CONST
+  qualified_type_id: 0xcebf3ccf
+}
 qualified {
   id: 0xefcb4746
   qualifier: CONST
@@ -35358,6 +35448,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0x81bb7781
 }
+qualified {
+  id: 0xfc9202dd
+  qualifier: CONST
+  qualified_type_id: 0x820fbdfd
+}
 qualified {
   id: 0xfcaba10a
   qualifier: CONST
@@ -46043,6 +46138,18 @@ member {
   name: "allocated"
   type_id: 0x6d7f5ff6
 }
+member {
+  id: 0x41611b26
+  name: "allocated"
+  type_id: 0x6d7f5ff6
+  offset: 8000
+}
+member {
+  id: 0x41611ed7
+  name: "allocated"
+  type_id: 0x6d7f5ff6
+  offset: 8512
+}
 member {
   id: 0x41b3ffd4
   name: "allocated_buffers"
@@ -66140,6 +66247,12 @@ member {
   type_id: 0x5d8155a5
   offset: 2880
 }
+member {
+  id: 0x9b6df7c9
+  name: "const_id_cnt"
+  type_id: 0x6720d32f
+  offset: 7552
+}
 member {
   id: 0x9e45699e
   name: "const_type"
@@ -66203,6 +66316,12 @@ member {
   type_id: 0x1bab96d2
   offset: 384
 }
+member {
+  id: 0xfd7a5c77
+  name: "constraints"
+  type_id: 0x13b72e31
+  offset: 8576
+}
 member {
   id: 0xfdfa65af
   name: "constraints"
@@ -66508,6 +66627,12 @@ member {
   name: "control_load"
   type_id: 0x2c808592
 }
+member {
+  id: 0xf0f0bb7d
+  name: "control_type_inst"
+  type_id: 0x18bd6530
+  offset: 128
+}
 member {
   id: 0x28722417
   name: "control_unload"
@@ -75535,6 +75660,12 @@ member {
   type_id: 0x11cf9350
   offset: 704
 }
+member {
+  id: 0x6d170429
+  name: "dev_attr_groups"
+  type_id: 0x607a4116
+  offset: 8384
+}
 member {
   id: 0x81f55009
   name: "dev_base_head"
@@ -76077,6 +76208,12 @@ member {
   type_id: 0x6d7f5ff6
   offset: 7488
 }
+member {
+  id: 0x327f9c2d
+  name: "dev_zone_attr_group"
+  type_id: 0xed8451a2
+  offset: 8064
+}
 member {
   id: 0x3a503292
   name: "devaddr"
@@ -96765,6 +96902,24 @@ member {
   type_id: 0x2eda6351
   offset: 768
 }
+member {
+  id: 0x1e0abfd9
+  name: "get_enable"
+  type_id: 0x2ee092c5
+  offset: 64
+}
+member {
+  id: 0x1e0b7810
+  name: "get_enable"
+  type_id: 0x2f22286c
+  offset: 384
+}
+member {
+  id: 0xc5eb7d5e
+  name: "get_energy_uj"
+  type_id: 0x2f1dff77
+  offset: 64
+}
 member {
   id: 0x522a2d74
   name: "get_error_flags"
@@ -97095,11 +97250,34 @@ member {
   type_id: 0x3ab13613
   offset: 704
 }
+member {
+  id: 0x870b1d4a
+  name: "get_max_energy_range_uj"
+  type_id: 0x2f1dff77
+}
+member {
+  id: 0x48da06d8
+  name: "get_max_power_range_uw"
+  type_id: 0x2f1dff77
+  offset: 192
+}
+member {
+  id: 0x690ef040
+  name: "get_max_power_uw"
+  type_id: 0x2f5626de
+  offset: 256
+}
 member {
   id: 0x9a73d86b
   name: "get_max_state"
   type_id: 0x2dbae528
 }
+member {
+  id: 0x39de1472
+  name: "get_max_time_window_us"
+  type_id: 0x2f5626de
+  offset: 384
+}
 member {
   id: 0x98fbeba0
   name: "get_max_timeout_count"
@@ -97154,6 +97332,18 @@ member {
   type_id: 0x3ab13613
   offset: 768
 }
+member {
+  id: 0x0a0601b8
+  name: "get_min_power_uw"
+  type_id: 0x2f5626de
+  offset: 320
+}
+member {
+  id: 0xbbc23eea
+  name: "get_min_time_window_us"
+  type_id: 0x2f5626de
+  offset: 448
+}
 member {
   id: 0x9c2b1ad1
   name: "get_mode"
@@ -97243,6 +97433,12 @@ member {
   type_id: 0x2cd5f6d3
   offset: 192
 }
+member {
+  id: 0x1a6adf19
+  name: "get_name"
+  type_id: 0x2ca5fa72
+  offset: 512
+}
 member {
   id: 0x1a6b98f3
   name: "get_name"
@@ -97481,12 +97677,24 @@ member {
   name: "get_port"
   type_id: 0x0ddd9122
 }
+member {
+  id: 0x4eae2f0e
+  name: "get_power_limit_uw"
+  type_id: 0x2f5626de
+  offset: 64
+}
 member {
   id: 0xa9079cd6
   name: "get_power_status"
   type_id: 0x2c80812c
   offset: 256
 }
+member {
+  id: 0xf4ddc253
+  name: "get_power_uw"
+  type_id: 0x2f1dff77
+  offset: 256
+}
 member {
   id: 0x5a0e21ce
   name: "get_priv"
@@ -97846,6 +98054,12 @@ member {
   type_id: 0x2cbf0dea
   offset: 576
 }
+member {
+  id: 0xcec3c09c
+  name: "get_time_window_us"
+  type_id: 0x2f5626de
+  offset: 192
+}
 member {
   id: 0x4b2d8406
   name: "get_timeleft"
@@ -105868,11 +106082,23 @@ member {
   type_id: 0xb3e7bac9
   offset: 8
 }
+member {
+  id: 0xb00531dc
+  name: "idr"
+  type_id: 0x04b89667
+  offset: 7296
+}
 member {
   id: 0xb0053b5f
   name: "idr"
   type_id: 0x04b89667
 }
+member {
+  id: 0xb0053df5
+  name: "idr"
+  type_id: 0x04b89667
+  offset: 7616
+}
 member {
   id: 0xb0053fbe
   name: "idr"
@@ -132541,6 +132767,12 @@ member {
   type_id: 0x0483e6f8
   offset: 1280
 }
+member {
+  id: 0x0ddfeb5a
+  name: "name"
+  type_id: 0x0483e6f8
+  offset: 64
+}
 member {
   id: 0x0ddfef10
   name: "name"
@@ -136503,6 +136735,12 @@ member {
   type_id: 0xd3c80119
   offset: 1024
 }
+member {
+  id: 0x0fa6c1c0
+  name: "node"
+  type_id: 0xd3c80119
+  offset: 8064
+}
 member {
   id: 0x0fa6c3e5
   name: "node"
@@ -138503,6 +138741,12 @@ member {
   type_id: 0x6720d32f
   offset: 51840
 }
+member {
+  id: 0x429469eb
+  name: "nr_zones"
+  type_id: 0x6720d32f
+  offset: 7488
+}
 member {
   id: 0x42b6c2d1
   name: "nr_zones"
@@ -142897,6 +143141,12 @@ member {
   name: "ops"
   type_id: 0x3b991d29
 }
+member {
+  id: 0xafb0e881
+  name: "ops"
+  type_id: 0x3be1e049
+  offset: 128
+}
 member {
   id: 0xafb0ea3a
   name: "ops"
@@ -143297,6 +143547,12 @@ member {
   type_id: 0x3162e876
   offset: 8448
 }
+member {
+  id: 0xafba7798
+  name: "ops"
+  type_id: 0x317fb103
+  offset: 7552
+}
 member {
   id: 0xafbac999
   name: "ops"
@@ -143432,6 +143688,12 @@ member {
   type_id: 0x356e4b27
   offset: 192
 }
+member {
+  id: 0xafbebcd3
+  name: "ops"
+  type_id: 0x35b4b910
+  offset: 192
+}
 member {
   id: 0xafbed153
   name: "ops"
@@ -146663,6 +146925,12 @@ member {
   type_id: 0x05f260a2
   offset: 256
 }
+member {
+  id: 0x8c6379be
+  name: "parent_idr"
+  type_id: 0x0bbe1c3e
+  offset: 7808
+}
 member {
   id: 0x018c7f62
   name: "parent_idx"
@@ -153012,6 +153280,12 @@ member {
   type_id: 0x6720d32f
   offset: 576
 }
+member {
+  id: 0x1d43d5c8
+  name: "power_zone"
+  type_id: 0x2c3e6eed
+  offset: 64
+}
 member {
   id: 0x9865a105
   name: "poweroff"
@@ -155175,6 +155449,12 @@ member {
   id: 0xf21ad1f2
   name: "private_data"
   type_id: 0x18bd6530
+  offset: 7872
+}
+member {
+  id: 0xf21ad1f3
+  name: "private_data"
+  type_id: 0x18bd6530
   offset: 3392
 }
 member {
@@ -164131,6 +164411,12 @@ member {
   type_id: 0x2d30dbe4
   offset: 4416
 }
+member {
+  id: 0xaeb60a04
+  name: "release"
+  type_id: 0x2ef15d2b
+  offset: 128
+}
 member {
   id: 0xaeb63cec
   name: "release"
@@ -164149,6 +164435,12 @@ member {
   type_id: 0x2f764d18
   offset: 960
 }
+member {
+  id: 0xaeb7c60b
+  name: "release"
+  type_id: 0x2f33e782
+  offset: 448
+}
 member {
   id: 0xe8e1b292
   name: "release_agent_path"
@@ -166977,6 +167269,12 @@ member {
   type_id: 0xfa03c3cb
   offset: 3776
 }
+member {
+  id: 0xf3a83d0c
+  name: "reset_energy_uj"
+  type_id: 0x2f33e782
+  offset: 128
+}
 member {
   id: 0x158b8e39
   name: "reset_frame_context"
@@ -176288,6 +176586,17 @@ member {
   type_id: 0x2ff974a7
   offset: 704
 }
+member {
+  id: 0x917a718a
+  name: "set_enable"
+  type_id: 0x2f5e98dd
+  offset: 320
+}
+member {
+  id: 0x917bb4f7
+  name: "set_enable"
+  type_id: 0x2e9c2274
+}
 member {
   id: 0xc51a7ec1
   name: "set_ent"
@@ -176833,6 +177142,11 @@ member {
   type_id: 0x2de9ae36
   offset: 2432
 }
+member {
+  id: 0x7baafc27
+  name: "set_power_limit_uw"
+  type_id: 0x2f5de562
+}
 member {
   id: 0x7eba804e
   name: "set_pretimeout"
@@ -177217,6 +177531,12 @@ member {
   type_id: 0xc9082b19
   offset: 224
 }
+member {
+  id: 0x462303e7
+  name: "set_time_window_us"
+  type_id: 0x2f5de562
+  offset: 128
+}
 member {
   id: 0x05571fa2
   name: "set_timeout"
@@ -210914,6 +211234,18 @@ member {
   name: "zone"
   type_id: 0x0a63398f
 }
+member {
+  id: 0xb67e31dd
+  name: "zone_attr_count"
+  type_id: 0x6720d32f
+  offset: 8000
+}
+member {
+  id: 0x6612b97a
+  name: "zone_dev_attrs"
+  type_id: 0x0ae4cc78
+  offset: 7936
+}
 member {
   id: 0x86c953a0
   name: "zone_device_data"
@@ -251018,6 +251350,99 @@ struct_union {
     member_id: 0x7f88b19c
   }
 }
+struct_union {
+  id: 0xea17f769
+  kind: STRUCT
+  name: "powercap_control_type"
+  definition {
+    bytesize: 1024
+    member_id: 0xce1ac149
+    member_id: 0xb00531dc
+    member_id: 0x429469eb
+    member_id: 0xafba7798
+    member_id: 0x2d4b3aaa
+    member_id: 0x41611b26
+    member_id: 0x0fa6c1c0
+  }
+}
+struct_union {
+  id: 0xcebf3ccf
+  kind: STRUCT
+  name: "powercap_control_type_ops"
+  definition {
+    bytesize: 24
+    member_id: 0x917bb4f7
+    member_id: 0x1e0abfd9
+    member_id: 0xaeb60a04
+  }
+}
+struct_union {
+  id: 0x9ab95d2b
+  kind: STRUCT
+  name: "powercap_zone"
+  definition {
+    bytesize: 1080
+    member_id: 0xcc480c42
+    member_id: 0x0ddfeb5a
+    member_id: 0xf0f0bb7d
+    member_id: 0xafbebcd3
+    member_id: 0xce1ac1e2
+    member_id: 0x9b6df7c9
+    member_id: 0xb0053df5
+    member_id: 0x8c6379be
+    member_id: 0xf21ad1f2
+    member_id: 0x6612b97a
+    member_id: 0xb67e31dd
+    member_id: 0x327f9c2d
+    member_id: 0x6d170429
+    member_id: 0x41611ed7
+    member_id: 0xfd7a5c77
+  }
+}
+struct_union {
+  id: 0x649c5e5b
+  kind: STRUCT
+  name: "powercap_zone_constraint"
+  definition {
+    bytesize: 24
+    member_id: 0xcc480c42
+    member_id: 0x1d43d5c8
+    member_id: 0xafb0e881
+  }
+}
+struct_union {
+  id: 0x675a2868
+  kind: STRUCT
+  name: "powercap_zone_constraint_ops"
+  definition {
+    bytesize: 72
+    member_id: 0x7baafc27
+    member_id: 0x4eae2f0e
+    member_id: 0x462303e7
+    member_id: 0xcec3c09c
+    member_id: 0x690ef040
+    member_id: 0x0a0601b8
+    member_id: 0x39de1472
+    member_id: 0xbbc23eea
+    member_id: 0x1a6adf19
+  }
+}
+struct_union {
+  id: 0x820fbdfd
+  kind: STRUCT
+  name: "powercap_zone_ops"
+  definition {
+    bytesize: 64
+    member_id: 0x870b1d4a
+    member_id: 0xc5eb7d5e
+    member_id: 0xf3a83d0c
+    member_id: 0x48da06d8
+    member_id: 0xf4ddc253
+    member_id: 0x917a718a
+    member_id: 0x1e0b7810
+    member_id: 0xaeb7c60b
+  }
+}
 struct_union {
   id: 0x8d548cbf
   kind: STRUCT
@@ -262804,7 +263229,7 @@ struct_union {
     member_id: 0xb3bb33a4
     member_id: 0x18f3f23f
     member_id: 0xc75c5a51
-    member_id: 0xf21ad1f2
+    member_id: 0xf21ad1f3
   }
 }
 struct_union {
@@ -295233,6 +295658,17 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x10f3dd9c
 }
+function {
+  id: 0x14b01c1c
+  return_type_id: 0x2c3e6eed
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x3015c47d
+  parameter_id: 0x3e10b518
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x35b4b910
+  parameter_id: 0x6720d32f
+  parameter_id: 0x3be1e049
+}
 function {
   id: 0x14b1b37d
   return_type_id: 0x48b5725f
@@ -296886,6 +297322,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x06835e9c
 }
+function {
+  id: 0x16fd178e
+  return_type_id: 0x3015c47d
+  parameter_id: 0x3015c47d
+  parameter_id: 0x3e10b518
+  parameter_id: 0x317fb103
+}
 function {
   id: 0x16fd805c
   return_type_id: 0x48b5725f
@@ -309351,6 +309794,12 @@ function {
   parameter_id: 0x30cfc1c2
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x90306f4f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3015c47d
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x903246db
   return_type_id: 0x6720d32f
@@ -310501,6 +310950,12 @@ function {
   parameter_id: 0x3f0185ef
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x91356b8b
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3015c47d
+  parameter_id: 0x2c3e6eed
+}
 function {
   id: 0x913618b5
   return_type_id: 0x6720d32f
@@ -310949,6 +311404,11 @@ function {
   parameter_id: 0x2ad2338c
   parameter_id: 0x07dcdbe1
 }
+function {
+  id: 0x91859230
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3015c47d
+}
 function {
   id: 0x9185daf6
   return_type_id: 0x6720d32f
@@ -311369,6 +311829,12 @@ function {
   parameter_id: 0x38d23361
   parameter_id: 0x00c72527
 }
+function {
+  id: 0x91c2ad89
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3015c47d
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x91c2e0c4
   return_type_id: 0x6720d32f
@@ -316372,6 +316838,12 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0x2ed870a7
 }
+function {
+  id: 0x96371b41
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x2e18f543
+}
 function {
   id: 0x963decf6
   return_type_id: 0x6720d32f
@@ -316548,6 +317020,11 @@ function {
   parameter_id: 0x2f5fce77
   parameter_id: 0x37b51a1e
 }
+function {
+  id: 0x968f7894
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+}
 function {
   id: 0x968fd49c
   return_type_id: 0x6720d32f
@@ -316770,6 +317247,12 @@ function {
   parameter_id: 0x384c5795
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x96c8472d
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x96c905b2
   return_type_id: 0x6720d32f
@@ -317014,6 +317497,13 @@ function {
   parameter_id: 0x2b8f13b3
   parameter_id: 0x1ce748dd
 }
+function {
+  id: 0x97187de5
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x6720d32f
+  parameter_id: 0x2e18f543
+}
 function {
   id: 0x9719ad86
   return_type_id: 0x6720d32f
@@ -317089,6 +317579,13 @@ function {
   parameter_id: 0x0b27dc43
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x97377314
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x6720d32f
+  parameter_id: 0x92233392
+}
 function {
   id: 0x973837f7
   return_type_id: 0x6720d32f
@@ -317102,6 +317599,12 @@ function {
   parameter_id: 0x2b8f13b3
   parameter_id: 0x16598b41
 }
+function {
+  id: 0x973a85eb
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x973d5c81
   return_type_id: 0x6720d32f
@@ -318673,6 +319176,12 @@ function {
   parameter_id: 0x295c7202
   parameter_id: 0x295c7202
 }
+function {
+  id: 0x98d70f54
+  return_type_id: 0x3e10b518
+  parameter_id: 0x2c3e6eed
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x98da7358
   return_type_id: 0x6720d32f
@@ -386258,6 +386767,42 @@ elf_symbol {
   type_id: 0x169d12f4
   full_name: "power_supply_unregister"
 }
+elf_symbol {
+  id: 0x5103fa37
+  name: "powercap_register_control_type"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x74c29aa3
+  type_id: 0x16fd178e
+  full_name: "powercap_register_control_type"
+}
+elf_symbol {
+  id: 0x5469c8f3
+  name: "powercap_register_zone"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x72a0a390
+  type_id: 0x14b01c1c
+  full_name: "powercap_register_zone"
+}
+elf_symbol {
+  id: 0x5f2a259f
+  name: "powercap_unregister_control_type"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd30deb7a
+  type_id: 0x91859230
+  full_name: "powercap_unregister_control_type"
+}
+elf_symbol {
+  id: 0x116aa230
+  name: "powercap_unregister_zone"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe0264b73
+  type_id: 0x91356b8b
+  full_name: "powercap_unregister_zone"
+}
 elf_symbol {
   id: 0x1a646dda
   name: "ppp_channel_index"
@@ -413020,6 +413565,10 @@ interface {
   symbol_id: 0x8900d981
   symbol_id: 0x9d05e78b
   symbol_id: 0x8a65993b
+  symbol_id: 0x5103fa37
+  symbol_id: 0x5469c8f3
+  symbol_id: 0x5f2a259f
+  symbol_id: 0x116aa230
   symbol_id: 0x1a646dda
   symbol_id: 0x52651755
   symbol_id: 0x3987d121
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index d3aa2d29239d..aef840a271ba 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -2489,6 +2489,10 @@
   power_supply_set_property
   power_supply_unregister
   power_supply_unreg_notifier
+  powercap_register_control_type
+  powercap_register_zone
+  powercap_unregister_control_type
+  powercap_unregister_zone
   ppp_channel_index
   ppp_dev_name
   ppp_input