diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 93612d7d7a12..677f3d269a43 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1045,6 +1045,7 @@
       <elf-symbol name='get_random_bytes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x79aa04a2'/>
       <elf-symbol name='get_random_u32' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd36dc10c'/>
       <elf-symbol name='get_task_mm' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe16d509e'/>
+      <elf-symbol name='get_task_pid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x85b3a0b3'/>
       <elf-symbol name='get_unmapped_area' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa67c9a7c'/>
       <elf-symbol name='get_unused_fd_flags' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa843805a'/>
       <elf-symbol name='get_user_pages' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe54c1356'/>
@@ -51188,6 +51189,7 @@
       </class-decl>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='drivers/gpu/drm/drm_crtc.c' language='LANG_C89'>
+      <class-decl name='drm_encoder' is-struct='yes' visibility='default' is-declaration-only='yes' id='d12f4a1e'/>
       <class-decl name='drm_mode_modeinfo' size-in-bits='544' is-struct='yes' visibility='default' filepath='include/uapi/drm/drm_mode.h' line='223' column='1' id='9d0ae2a2'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='clock' type-id='3f1a6b60' visibility='default' filepath='include/uapi/drm/drm_mode.h' line='224' column='1'/>
@@ -51237,6 +51239,7 @@
       </class-decl>
       <qualified-type-def type-id='9d0ae2a2' const='yes' id='c2623161'/>
       <pointer-type-def type-id='c2623161' size-in-bits='64' id='4b939911'/>
+      <pointer-type-def type-id='d12f4a1e' size-in-bits='64' id='74d89ebe'/>
       <function-decl name='dma_fence_init' mangled-name='dma_fence_init' filepath='include/linux/dma-fence.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_fence_init'>
         <parameter type-id='28271da3'/>
         <parameter type-id='13d85783'/>
@@ -51348,23 +51351,7 @@
           <var-decl name='out_fence' type-id='28271da3' visibility='default' filepath='include/drm/drm_writeback.h' line='110' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='reservation_object' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/reservation.h' line='73' column='1' id='7de6f371'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lock' type-id='45793a97' visibility='default' filepath='include/linux/reservation.h' line='74' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='seq' type-id='e14c3b11' visibility='default' filepath='include/linux/reservation.h' line='75' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='fence_excl' type-id='28271da3' visibility='default' filepath='include/linux/reservation.h' line='77' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='fence' type-id='f9db88dc' visibility='default' filepath='include/linux/reservation.h' line='78' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='staged' type-id='f9db88dc' visibility='default' filepath='include/linux/reservation.h' line='79' column='1'/>
-        </data-member>
-      </class-decl>
+      <class-decl name='reservation_object' is-struct='yes' visibility='default' is-declaration-only='yes' id='7de6f372'/>
       <array-type-def dimensions='1' type-id='abd62a96' size-in-bits='256' id='a459476c'>
         <subrange length='4' type-id='7ff19f0f' id='16fe7105'/>
       </array-type-def>
@@ -54775,7 +54762,7 @@
       <pointer-type-def type-id='c016e2d6' size-in-bits='64' id='49e4df08'/>
       <pointer-type-def type-id='304ac94e' size-in-bits='64' id='8f0815d8'/>
       <pointer-type-def type-id='0c98f83d' size-in-bits='64' id='c82424f9'/>
-      <pointer-type-def type-id='7de6f371' size-in-bits='64' id='4702a659'/>
+      <pointer-type-def type-id='7de6f372' size-in-bits='64' id='4702a65a'/>
       <pointer-type-def type-id='d5a6cadd' size-in-bits='64' id='11637f61'/>
       <pointer-type-def type-id='d1d4db8e' size-in-bits='64' id='32774f90'/>
       <pointer-type-def type-id='8cdee791' size-in-bits='64' id='e33a30a5'/>
@@ -55389,7 +55376,7 @@
       </function-type>
       <function-type size-in-bits='64' id='d5a6cadd'>
         <parameter type-id='abd62a96'/>
-        <return type-id='4702a659'/>
+        <return type-id='4702a65a'/>
       </function-type>
       <function-type size-in-bits='64' id='d1d4db8e'>
         <parameter type-id='abd62a96'/>
@@ -55844,7 +55831,6 @@
       </function-type>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='drivers/gpu/drm/drm_dp_mst_topology.c' language='LANG_C89'>
-      <class-decl name='drm_fb_helper' is-struct='yes' visibility='default' is-declaration-only='yes' id='55b7e9ad'/>
       <array-type-def dimensions='1' type-id='ecbd5721' size-in-bits='3200' id='014100ec'>
         <subrange length='16' type-id='7ff19f0f' id='848d0938'/>
       </array-type-def>
@@ -56435,7 +56421,6 @@
       <pointer-type-def type-id='7a5f8aa3' size-in-bits='64' id='778f4653'/>
       <pointer-type-def type-id='e1653094' size-in-bits='64' id='9117d942'/>
       <pointer-type-def type-id='9117d942' size-in-bits='64' id='d08b3eb8'/>
-      <pointer-type-def type-id='55b7e9ad' size-in-bits='64' id='147b8c0b'/>
       <pointer-type-def type-id='a7fa16d9' size-in-bits='64' id='c91d1bf1'/>
       <pointer-type-def type-id='20d6a08a' size-in-bits='64' id='7a134fac'/>
       <pointer-type-def type-id='9a9b3035' size-in-bits='64' id='7d8f7dd9'/>
@@ -57291,6 +57276,9 @@
       </function-decl>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='drivers/gpu/drm/drm_gem.c' language='LANG_C89'>
+      <pointer-type-def type-id='c201baab' size-in-bits='64' id='5e4f599b'/>
+      <pointer-type-def type-id='f01bc09a' size-in-bits='64' id='e68e04c2'/>
+      <pointer-type-def type-id='3bc524c1' size-in-bits='64' id='abd62a97'/>
       <function-decl name='drm_gem_object_init' mangled-name='drm_gem_object_init' filepath='drivers/gpu/drm/drm_gem.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_init'>
         <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_gem.c' line='135' column='1'/>
         <parameter type-id='abd62a97' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='136' column='1'/>
@@ -57353,7 +57341,23 @@
         <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='997' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <pointer-type-def type-id='3bc524c1' size-in-bits='64' id='abd62a97'/>
+      <class-decl name='dma_buf_attachment' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/dma-buf.h' line='479' column='1' id='f01bc09a'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='dmabuf' type-id='5e4f599b' visibility='default' filepath='include/linux/dma-buf.h' line='480' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/linux/dma-buf.h' line='481' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='node' type-id='72f469ec' visibility='default' filepath='include/linux/dma-buf.h' line='482' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/dma-buf.h' line='483' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='dma_map_attrs' type-id='7359adad' visibility='default' filepath='include/linux/dma-buf.h' line='484' column='1'/>
+        </data-member>
+      </class-decl>
       <class-decl name='drm_gem_object' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/drm/drm_gem.h' line='49' column='1' id='3bc524c1'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='refcount' type-id='400fb07b' visibility='default' filepath='include/drm/drm_gem.h' line='59' column='1'/>
@@ -57383,7 +57387,6 @@
           <var-decl name='import_attach' type-id='e68e04c2' visibility='default' filepath='include/drm/drm_gem.h' line='148' column='1'/>
         </data-member>
       </class-decl>
-      <pointer-type-def type-id='f01bc09a' size-in-bits='64' id='e68e04c2'/>
       <class-decl name='drm_vma_offset_node' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/drm/drm_vma_manager.h' line='40' column='1' id='743d7e52'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='vm_lock' type-id='ac16795b' visibility='default' filepath='include/drm/drm_vma_manager.h' line='41' column='1'/>
@@ -57398,23 +57401,6 @@
           <var-decl name='readonly' type-id='b50a4934' visibility='default' filepath='include/drm/drm_vma_manager.h' line='44' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='dma_buf_attachment' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/dma-buf.h' line='479' column='1' id='f01bc09a'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='dmabuf' type-id='5e4f599b' visibility='default' filepath='include/linux/dma-buf.h' line='480' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/linux/dma-buf.h' line='481' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='node' type-id='72f469ec' visibility='default' filepath='include/linux/dma-buf.h' line='482' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/dma-buf.h' line='483' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='dma_map_attrs' type-id='7359adad' visibility='default' filepath='include/linux/dma-buf.h' line='484' column='1'/>
-        </data-member>
-      </class-decl>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='drivers/gpu/drm/drm_gem_framebuffer_helper.c' language='LANG_C89'>
       <array-type-def dimensions='1' type-id='28271da3' size-in-bits='infinite' id='f5432a6f'>
@@ -57443,33 +57429,24 @@
           <var-decl name='name' type-id='95e97e5e' visibility='default' filepath='include/drm/drm_gem.h' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1792'>
-          <var-decl name='dma_buf' type-id='5e4f599b' visibility='default' filepath='include/drm/drm_gem.h' line='129' column='1'/>
+          <var-decl name='dma_buf' type-id='5e4f599c' visibility='default' filepath='include/drm/drm_gem.h' line='129' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1856'>
-          <var-decl name='import_attach' type-id='e68e04c2' visibility='default' filepath='include/drm/drm_gem.h' line='148' column='1'/>
+          <var-decl name='import_attach' type-id='e68e04c1' visibility='default' filepath='include/drm/drm_gem.h' line='148' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='drm_mm' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='186' column='1' id='0b8ea949'>
+      <class-decl name='drm_vma_offset_node' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/drm/drm_vma_manager.h' line='40' column='1' id='743d7e52'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='color_adjust' type-id='4bcdfb80' visibility='default' filepath='include/drm/drm_mm.h' line='196' column='1'/>
+          <var-decl name='vm_lock' type-id='ac16795b' visibility='default' filepath='include/drm/drm_vma_manager.h' line='41' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='hole_stack' type-id='72f469ec' visibility='default' filepath='include/drm/drm_mm.h' line='202' column='1'/>
+          <var-decl name='vm_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_vma_manager.h' line='42' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='head_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_mm.h' line='205' column='1'/>
+        <data-member access='public' layout-offset-in-bits='1344'>
+          <var-decl name='vm_files' type-id='dec44472' visibility='default' filepath='include/drm/drm_vma_manager.h' line='43' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='1472'>
-          <var-decl name='interval_tree' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='207' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='1600'>
-          <var-decl name='holes_size' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='208' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='1728'>
-          <var-decl name='holes_addr' type-id='dec44472' visibility='default' filepath='include/drm/drm_mm.h' line='209' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='1792'>
-          <var-decl name='scan_active' type-id='7359adad' visibility='default' filepath='include/drm/drm_mm.h' line='211' column='1'/>
+        <data-member access='public' layout-offset-in-bits='7'>
+          <var-decl name='readonly' type-id='b50a4934' visibility='default' filepath='include/drm/drm_vma_manager.h' line='44' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='drm_mm_node' size-in-bits='1280' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='155' column='1' id='60498a7e'>
@@ -57513,18 +57490,27 @@
           <var-decl name='scanned_block' type-id='b50a4934' visibility='default' filepath='include/drm/drm_mm.h' line='172' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='drm_vma_offset_node' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/drm/drm_vma_manager.h' line='40' column='1' id='743d7e52'>
+      <class-decl name='drm_mm' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='186' column='1' id='0b8ea949'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='vm_lock' type-id='ac16795b' visibility='default' filepath='include/drm/drm_vma_manager.h' line='41' column='1'/>
+          <var-decl name='color_adjust' type-id='4bcdfb80' visibility='default' filepath='include/drm/drm_mm.h' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='vm_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_vma_manager.h' line='42' column='1'/>
+          <var-decl name='hole_stack' type-id='72f469ec' visibility='default' filepath='include/drm/drm_mm.h' line='202' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='1344'>
-          <var-decl name='vm_files' type-id='dec44472' visibility='default' filepath='include/drm/drm_vma_manager.h' line='43' column='1'/>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='head_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_mm.h' line='205' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='7'>
-          <var-decl name='readonly' type-id='b50a4934' visibility='default' filepath='include/drm/drm_vma_manager.h' line='44' column='1'/>
+        <data-member access='public' layout-offset-in-bits='1472'>
+          <var-decl name='interval_tree' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='207' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1600'>
+          <var-decl name='holes_size' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='208' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1728'>
+          <var-decl name='holes_addr' type-id='dec44472' visibility='default' filepath='include/drm/drm_mm.h' line='209' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1792'>
+          <var-decl name='scan_active' type-id='7359adad' visibility='default' filepath='include/drm/drm_mm.h' line='211' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='dma_buf' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/dma-buf.h' line='431' column='1' id='c201baab'>
@@ -57568,7 +57554,7 @@
           <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/dma-buf.h' line='444' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1152'>
-          <var-decl name='resv' type-id='4702a659' visibility='default' filepath='include/linux/dma-buf.h' line='445' column='1'/>
+          <var-decl name='resv' type-id='4702a65a' visibility='default' filepath='include/linux/dma-buf.h' line='445' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='poll' type-id='b5ab048f' visibility='default' filepath='include/linux/dma-buf.h' line='448' column='1'/>
@@ -57647,7 +57633,7 @@
       </class-decl>
       <class-decl name='dma_buf_attachment' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/dma-buf.h' line='479' column='1' id='f01bc09a'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='dmabuf' type-id='5e4f599b' visibility='default' filepath='include/linux/dma-buf.h' line='480' column='1'/>
+          <var-decl name='dmabuf' type-id='5e4f599c' visibility='default' filepath='include/linux/dma-buf.h' line='480' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/linux/dma-buf.h' line='481' column='1'/>
@@ -57662,6 +57648,23 @@
           <var-decl name='dma_map_attrs' type-id='7359adad' visibility='default' filepath='include/linux/dma-buf.h' line='484' column='1'/>
         </data-member>
       </class-decl>
+      <class-decl name='reservation_object' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/reservation.h' line='73' column='1' id='7de6f371'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='lock' type-id='45793a97' visibility='default' filepath='include/linux/reservation.h' line='74' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='seq' type-id='e14c3b11' visibility='default' filepath='include/linux/reservation.h' line='75' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='fence_excl' type-id='28271da3' visibility='default' filepath='include/linux/reservation.h' line='77' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='fence' type-id='f9db88dc' visibility='default' filepath='include/linux/reservation.h' line='78' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='staged' type-id='f9db88dc' visibility='default' filepath='include/linux/reservation.h' line='79' column='1'/>
+        </data-member>
+      </class-decl>
       <class-decl name='reservation_object_list' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/reservation.h' line='59' column='1' id='ccc6bea6'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/reservation.h' line='60' column='1'/>
@@ -57701,10 +57704,7 @@
       <pointer-type-def type-id='38cc1773' size-in-bits='64' id='c248c11b'/>
       <qualified-type-def type-id='60498a7e' const='yes' id='809e8e55'/>
       <pointer-type-def type-id='809e8e55' size-in-bits='64' id='f89a51ed'/>
-      <pointer-type-def type-id='c201baab' size-in-bits='64' id='5e4f599b'/>
-      <pointer-type-def type-id='f01bc09a' size-in-bits='64' id='e68e04c2'/>
       <pointer-type-def type-id='54c5dd35' size-in-bits='64' id='a47516e5'/>
-      <pointer-type-def type-id='3bc524c1' size-in-bits='64' id='abd62a97'/>
       <pointer-type-def type-id='0b8ea949' size-in-bits='64' id='0ee978f1'/>
       <pointer-type-def type-id='9977c731' size-in-bits='64' id='b512ba7d'/>
       <pointer-type-def type-id='88776799' size-in-bits='64' id='127a97dd'/>
@@ -57727,14 +57727,14 @@
       <function-decl name='drm_gem_fb_get_obj' mangled-name='drm_gem_fb_get_obj' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_fb_get_obj'>
         <parameter type-id='7b332e1c' name='fb' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='50' column='1'/>
         <parameter type-id='f0981eeb' name='plane' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='51' column='1'/>
-        <return type-id='abd62a97'/>
+        <return type-id='abd62a96'/>
       </function-decl>
       <function-decl name='drm_gem_fb_destroy' mangled-name='drm_gem_fb_destroy' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_fb_destroy'>
         <parameter type-id='7b332e1c' name='fb' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='97' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='drm_gem_object_put_unlocked' mangled-name='drm_gem_object_put_unlocked' filepath='include/drm/drm_gem.h' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_put_unlocked'>
-        <parameter type-id='abd62a97'/>
+        <parameter type-id='abd62a96'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='drm_gem_fb_create_handle' mangled-name='drm_gem_fb_create_handle' filepath='drivers/gpu/drm/drm_gem_framebuffer_helper.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_fb_create_handle'>
@@ -57745,14 +57745,14 @@
       </function-decl>
       <function-decl name='drm_gem_handle_create' mangled-name='drm_gem_handle_create' filepath='include/drm/drm_gem.h' line='275' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_handle_create'>
         <parameter type-id='9e99ecc1'/>
-        <parameter type-id='abd62a97'/>
+        <parameter type-id='abd62a96'/>
         <parameter type-id='807869d3'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='drm_gem_object_lookup' mangled-name='drm_gem_object_lookup' filepath='include/drm/drm_gem.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_lookup'>
         <parameter type-id='9e99ecc1'/>
         <parameter type-id='f0981eeb'/>
-        <return type-id='abd62a97'/>
+        <return type-id='abd62a96'/>
       </function-decl>
       <function-decl name='drm_framebuffer_init' mangled-name='drm_framebuffer_init' filepath='include/drm/drm_framebuffer.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_framebuffer_init'>
         <parameter type-id='8898134d'/>
@@ -57773,44 +57773,44 @@
         <return type-id='48b5725f'/>
       </function-decl>
       <function-type size-in-bits='64' id='9977c731'>
-        <parameter type-id='5e4f599b'/>
-        <parameter type-id='e68e04c2'/>
+        <parameter type-id='5e4f599c'/>
+        <parameter type-id='e68e04c1'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='88776799'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='eea6b025'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='c3e60881'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='eea6b025'/>
         <parameter type-id='f0981eeb'/>
         <parameter type-id='f0981eeb'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='8b9912bb'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='1d2c2b85'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='440843bd'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='f1397309'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='70e959e4'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='2ae08426'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='80c26d33'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='eaa32e2f'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <function-type size-in-bits='64' id='efdb04f5'>
-        <parameter type-id='e68e04c2'/>
+        <parameter type-id='e68e04c1'/>
         <parameter type-id='eea6b025'/>
         <return type-id='4adb0e6a'/>
       </function-type>
@@ -57822,27 +57822,27 @@
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='7908d890'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='d299a9b0'>
-        <parameter type-id='5e4f599b'/>
-        <parameter type-id='e68e04c2'/>
+        <parameter type-id='5e4f599c'/>
+        <parameter type-id='e68e04c1'/>
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='45d6b556'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='7359adad'/>
         <parameter type-id='eaa32e2f'/>
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='9a321b4a'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='eaa32e2f'/>
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='7e5de8f5'>
-        <parameter type-id='e68e04c2'/>
+        <parameter type-id='e68e04c1'/>
         <parameter type-id='4adb0e6a'/>
         <parameter type-id='eea6b025'/>
         <return type-id='48b5725f'/>
@@ -57853,11 +57853,11 @@
         <return type-id='48b5725f'/>
       </function-type>
       <function-type size-in-bits='64' id='a1b495b8'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <return type-id='eaa32e2f'/>
       </function-type>
       <function-type size-in-bits='64' id='ddfa4afc'>
-        <parameter type-id='5e4f599b'/>
+        <parameter type-id='5e4f599c'/>
         <parameter type-id='7359adad'/>
         <return type-id='eaa32e2f'/>
       </function-type>
@@ -58148,9 +58148,7 @@
       </function-decl>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='drivers/gpu/drm/drm_modes.c' language='LANG_C89'>
-      <class-decl name='drm_encoder' is-struct='yes' visibility='default' is-declaration-only='yes' id='d12f4a1e'/>
       <pointer-type-def type-id='458106cb' size-in-bits='64' id='20e1573b'/>
-      <pointer-type-def type-id='d12f4a1e' size-in-bits='64' id='74d89ebe'/>
       <function-decl name='drm_cvt_mode' mangled-name='drm_cvt_mode' filepath='drivers/gpu/drm/drm_modes.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_cvt_mode'>
         <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_modes.c' line='143' column='1'/>
         <parameter type-id='95e97e5e' name='hdisplay' filepath='drivers/gpu/drm/drm_modes.c' line='143' column='1'/>
@@ -58334,7 +58332,7 @@
           <var-decl name='flags' type-id='95e97e5e' visibility='default' filepath='include/linux/dma-buf.h' line='505' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='resv' type-id='4702a659' visibility='default' filepath='include/linux/dma-buf.h' line='506' column='1'/>
+          <var-decl name='resv' type-id='4702a65a' visibility='default' filepath='include/linux/dma-buf.h' line='506' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/dma-buf.h' line='507' column='1'/>
@@ -60116,6 +60114,7 @@
       <pointer-type-def type-id='3e65a527' size-in-bits='64' id='1b1e5363'/>
       <pointer-type-def type-id='06991f7d' size-in-bits='64' id='7e38d909'/>
       <pointer-type-def type-id='531d31a2' size-in-bits='64' id='d2c32f54'/>
+      <pointer-type-def type-id='7de6f371' size-in-bits='64' id='4702a659'/>
       <pointer-type-def type-id='5b7e0fbe' size-in-bits='64' id='aab7fd14'/>
       <pointer-type-def type-id='0448ebb1' size-in-bits='64' id='723d4d79'/>
       <pointer-type-def type-id='0abbafb9' size-in-bits='64' id='0975b661'/>
@@ -105773,6 +105772,11 @@
         <parameter type-id='8567d8b0'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='get_task_pid' mangled-name='get_task_pid' filepath='include/linux/pid.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_task_pid'>
+        <parameter type-id='f23e2572'/>
+        <parameter type-id='ce78cf46'/>
+        <return type-id='b94e5398'/>
+      </function-decl>
       <function-decl name='wait_for_completion_killable' mangled-name='wait_for_completion_killable' filepath='include/linux/completion.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait_for_completion_killable'>
         <parameter type-id='389faaf7'/>
         <return type-id='95e97e5e'/>
@@ -138409,7 +138413,6 @@
       <pointer-type-def type-id='597bfbe2' size-in-bits='64' id='a62d5bd8'/>
       <qualified-type-def type-id='ad974450' const='yes' id='319b3a77'/>
       <pointer-type-def type-id='319b3a77' size-in-bits='64' id='745ce067'/>
-      <pointer-type-def type-id='2e443c2c' size-in-bits='64' id='74b427ec'/>
       <pointer-type-def type-id='d26d2ca4' size-in-bits='64' id='5b6d9de6'/>
       <pointer-type-def type-id='7e019027' size-in-bits='64' id='1b64445b'/>
       <pointer-type-def type-id='6f527014' size-in-bits='64' id='b8430c5e'/>
@@ -139123,6 +139126,7 @@
           <var-decl name='invert' type-id='b50a4934' visibility='default' filepath='include/sound/soc.h' line='667' column='1'/>
         </data-member>
       </class-decl>
+      <pointer-type-def type-id='2e443c2c' size-in-bits='64' id='74b427ec'/>
       <pointer-type-def type-id='ad7e730a' size-in-bits='64' id='fcd78288'/>
       <function-decl name='snd_soc_card_jack_new' mangled-name='snd_soc_card_jack_new' filepath='sound/soc/soc-jack.c' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_card_jack_new'>
         <parameter type-id='3059cd0b' name='card' filepath='sound/soc/soc-jack.c' line='59' column='1'/>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index 734dbbd8b8f2..6397060495da 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -1569,6 +1569,7 @@
   getboottime64
   get_random_u32
   get_task_mm
+  get_task_pid
   get_unmapped_area
   get_user_pages
   idr_for_each