diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index f535ad8a6b61..2c501eb4c49c 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1263,11 +1263,13 @@
       <elf-symbol name='crypto_aead_setkey' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4513d353'/>
       <elf-symbol name='crypto_aes_set_key' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcec2d7b'/>
       <elf-symbol name='crypto_ahash_digest' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6c8eec5'/>
+      <elf-symbol name='crypto_ahash_final' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5fc9b0c4'/>
       <elf-symbol name='crypto_ahash_finup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcb90c326'/>
       <elf-symbol name='crypto_ahash_setkey' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x29472881'/>
       <elf-symbol name='crypto_alg_mod_lookup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfc86f5f9'/>
       <elf-symbol name='crypto_alloc_aead' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcf8e5211'/>
       <elf-symbol name='crypto_alloc_ahash' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2f890773'/>
+      <elf-symbol name='crypto_alloc_akcipher' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe4f54e22'/>
       <elf-symbol name='crypto_alloc_base' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbb720070'/>
       <elf-symbol name='crypto_alloc_rng' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x95788214'/>
       <elf-symbol name='crypto_alloc_shash' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x714c001e'/>
@@ -1299,6 +1301,7 @@
       <elf-symbol name='crypto_register_aeads' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x992ab5ac'/>
       <elf-symbol name='crypto_register_ahash' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x89a16782'/>
       <elf-symbol name='crypto_register_ahashes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xda699b4a'/>
+      <elf-symbol name='crypto_register_akcipher' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7628fdfb'/>
       <elf-symbol name='crypto_register_alg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe35cab54'/>
       <elf-symbol name='crypto_register_algs' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdc7e4244'/>
       <elf-symbol name='crypto_register_rng' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x447c21c0'/>
@@ -1330,6 +1333,7 @@
       <elf-symbol name='crypto_spawn_tfm2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xce0b26d7'/>
       <elf-symbol name='crypto_unregister_aead' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd2ab2207'/>
       <elf-symbol name='crypto_unregister_ahash' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x87f0be17'/>
+      <elf-symbol name='crypto_unregister_akcipher' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xefe1696c'/>
       <elf-symbol name='crypto_unregister_alg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x15e337f'/>
       <elf-symbol name='crypto_unregister_algs' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe64761df'/>
       <elf-symbol name='crypto_unregister_rng' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe09f55eb'/>
@@ -1409,6 +1413,7 @@
       <elf-symbol name='delayed_work_timer_fn' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x253af43d'/>
       <elf-symbol name='delete_from_page_cache' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4cdafe55'/>
       <elf-symbol name='dentry_path_raw' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x27a429f2'/>
+      <elf-symbol name='des_expand_key' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa8fb743d'/>
       <elf-symbol name='desc_to_gpio' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe3a4b762'/>
       <elf-symbol name='destroy_workqueue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8c03d20c'/>
       <elf-symbol name='dev_alloc_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6dfd7d3c'/>
@@ -4523,6 +4528,8 @@
       <elf-symbol name='rproc_shutdown' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb731f6c5'/>
       <elf-symbol name='rproc_vq_interrupt' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x28751d19'/>
       <elf-symbol name='rq_flush_dcache_pages' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9f373197'/>
+      <elf-symbol name='rsa_parse_priv_key' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd75b20aa'/>
+      <elf-symbol name='rsa_parse_pub_key' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x89ae7aa0'/>
       <elf-symbol name='rt_mutex_lock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x44e32dab'/>
       <elf-symbol name='rt_mutex_trylock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7dbcc25a'/>
       <elf-symbol name='rt_mutex_unlock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x925133f'/>
@@ -4755,6 +4762,7 @@
       <elf-symbol name='sg_miter_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x290f2ad7'/>
       <elf-symbol name='sg_miter_start' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xea1aa32a'/>
       <elf-symbol name='sg_miter_stop' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa77c6467'/>
+      <elf-symbol name='sg_nents' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x461d16ca'/>
       <elf-symbol name='sg_nents_for_len' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4230a8d7'/>
       <elf-symbol name='sg_next' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x87b8798d'/>
       <elf-symbol name='sg_pcopy_from_buffer' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd0fe8d51'/>
@@ -9953,6 +9961,11 @@
         <parameter type-id='f0981eeb'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <class-decl name='des_ctx' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/crypto/des.h' line='19' column='1' id='099df029'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='expkey' type-id='6dcfc3c6' visibility='default' filepath='include/crypto/des.h' line='20' column='1'/>
+        </data-member>
+      </class-decl>
       <pointer-type-def type-id='10c448af' size-in-bits='64' id='09a20593'/>
       <array-type-def dimensions='1' type-id='91ce1af9' size-in-bits='infinite' id='09b35382'>
         <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/>
@@ -10886,6 +10899,7 @@
         <parameter type-id='0fbf3cfd'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <pointer-type-def type-id='f3eb0af8' size-in-bits='64' id='0be5814e'/>
       <class-decl name='input_handler' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/input.h' line='308' column='1' id='0be82508'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='private' type-id='eaa32e2f' visibility='default' filepath='include/linux/input.h' line='310' column='1'/>
@@ -19649,6 +19663,7 @@
         <parameter type-id='f9b06939'/>
         <return type-id='98b07df9'/>
       </function-type>
+      <pointer-type-def type-id='d7725d0a' size-in-bits='64' id='22c6c194'/>
       <class-decl name='cpuidle_state_kobj' is-struct='yes' visibility='default' is-declaration-only='yes' id='22d74cfc'/>
       <function-type size-in-bits='64' id='22ddde2b'>
         <parameter type-id='5771c601'/>
@@ -26297,6 +26312,7 @@
         <parameter type-id='0fbf3cfd'/>
         <return type-id='48b5725f'/>
       </function-type>
+      <pointer-type-def type-id='c55537e7' size-in-bits='64' id='33cd8a7f'/>
       <pointer-type-def type-id='ac0bc8bd' size-in-bits='64' id='33ceb73d'/>
       <pointer-type-def type-id='cb5a1a3f' size-in-bits='64' id='33d70f0f'/>
       <class-decl name='snd_compr_ops' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/sound/compress_driver.h' line='115' column='1' id='33d73f3b'>
@@ -35734,6 +35750,10 @@
         <parameter type-id='f0981eeb'/>
         <return type-id='48b5725f'/>
       </function-type>
+      <function-type size-in-bits='64' id='4d6635de'>
+        <parameter type-id='0be5814e'/>
+        <return type-id='95e97e5e'/>
+      </function-type>
       <pointer-type-def type-id='483ecac1' size-in-bits='64' id='4d6d9805'/>
       <function-type size-in-bits='64' id='4d6ef9da'>
         <parameter type-id='97fbef77'/>
@@ -39880,6 +39900,7 @@
         <parameter type-id='4b8b2cf3'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <pointer-type-def type-id='e395c9f1' size-in-bits='64' id='5663f3d9'/>
       <pointer-type-def type-id='81a7f511' size-in-bits='64' id='56670be1'/>
       <array-type-def dimensions='1' type-id='e0cc39f6' size-in-bits='infinite' id='566debc6'>
         <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/>
@@ -45695,6 +45716,7 @@
           <var-decl name='failcnt' type-id='7359adad' visibility='default' filepath='include/linux/page_counter.h' line='29' column='1'/>
         </data-member>
       </class-decl>
+      <pointer-type-def type-id='4d6635de' size-in-bits='64' id='63632b88'/>
       <pointer-type-def type-id='81645a21' size-in-bits='64' id='63657a49'/>
       <pointer-type-def type-id='81d7511f' size-in-bits='64' id='63662edb'/>
       <pointer-type-def type-id='60498a7e' size-in-bits='64' id='6368b074'/>
@@ -49537,6 +49559,7 @@
       <pointer-type-def type-id='4bf6badc' size-in-bits='64' id='6c3dd54a'/>
       <pointer-type-def type-id='92cdf314' size-in-bits='64' id='6c4618be'/>
       <pointer-type-def type-id='81d856a4' size-in-bits='64' id='6c473266'/>
+      <pointer-type-def type-id='89977c8a' size-in-bits='64' id='6c4ff4a8'/>
       <pointer-type-def type-id='078589a3' size-in-bits='64' id='6c534e17'/>
       <class-decl name='serdev_controller' size-in-bits='7360' is-struct='yes' visibility='default' filepath='include/linux/serdev.h' line='103' column='1' id='6c569e75'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -61684,6 +61707,11 @@
         <parameter type-id='5799dc94'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <class-decl name='crypto_akcipher' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/crypto/akcipher.h' line='48' column='1' id='89977c8a'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='base' type-id='0328c8b6' visibility='default' filepath='include/crypto/akcipher.h' line='49' column='1'/>
+        </data-member>
+      </class-decl>
       <class-decl name='usb_cdc_ncm_dpe16' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/usb/cdc.h' line='372' column='1' id='89981240'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='wDatagramIndex' type-id='23119536' visibility='default' filepath='include/uapi/linux/usb/cdc.h' line='373' column='1'/>
@@ -72461,6 +72489,7 @@
           <var-decl name='write_buf' type-id='26a90f95' visibility='default' filepath='include/linux/gnss.h' line='55' column='1'/>
         </data-member>
       </class-decl>
+      <pointer-type-def type-id='b6fe802d' size-in-bits='64' id='a273cbc9'/>
       <pointer-type-def type-id='6161d888' size-in-bits='64' id='a2782ece'/>
       <class-decl name='nf_ct_event_notifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/net/netfilter/nf_conntrack_ecache.h' line='75' column='1' id='a27aef61'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -76919,6 +76948,7 @@
       <pointer-type-def type-id='7e55d788' size-in-bits='64' id='acc283aa'/>
       <typedef-decl name='resource_size_t' type-id='2522883d' filepath='include/linux/types.h' line='158' column='1' id='acc63fdf'/>
       <qualified-type-def type-id='034e1b08' const='yes' id='acc9767b'/>
+      <pointer-type-def type-id='099df029' size-in-bits='64' id='acd39461'/>
       <pointer-type-def type-id='094d8048' size-in-bits='64' id='acd96ee1'/>
       <pointer-type-def type-id='51192447' size-in-bits='64' id='acda35bb'/>
       <function-type size-in-bits='64' id='ace9a76b'>
@@ -81418,6 +81448,10 @@
       </class-decl>
       <pointer-type-def type-id='340461fe' size-in-bits='64' id='b6e600bc'/>
       <pointer-type-def type-id='60023af2' size-in-bits='64' id='b6ee62dc'/>
+      <function-type size-in-bits='64' id='b6fe802d'>
+        <parameter type-id='6c4ff4a8'/>
+        <return type-id='48b5725f'/>
+      </function-type>
       <function-type size-in-bits='64' id='b7022237'>
         <parameter type-id='ca9354d1'/>
         <return type-id='eba182c8'/>
@@ -82193,6 +82227,10 @@
         <enumerator name='IIO_BE' value='1'/>
         <enumerator name='IIO_LE' value='2'/>
       </enum-decl>
+      <function-type size-in-bits='64' id='b8c3454a'>
+        <parameter type-id='6c4ff4a8'/>
+        <return type-id='95e97e5e'/>
+      </function-type>
       <pointer-type-def type-id='8712a502' size-in-bits='64' id='b8cd8f00'/>
       <class-decl name='media_ctl' size-in-bits='3968' is-struct='yes' visibility='default' filepath='sound/usb/media.h' line='28' column='1' id='b8cdc165'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -89558,6 +89596,41 @@
           <var-decl name='migrate_to_ram' type-id='bb28da1c' visibility='default' filepath='include/linux/memremap.h' line='89' column='1'/>
         </data-member>
       </class-decl>
+      <class-decl name='akcipher_alg' size-in-bits='4096' is-struct='yes' visibility='default' filepath='include/crypto/akcipher.h' line='92' column='1' id='c55537e7'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='sign' type-id='63632b88' visibility='default' filepath='include/crypto/akcipher.h' line='93' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='verify' type-id='63632b88' visibility='default' filepath='include/crypto/akcipher.h' line='94' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='encrypt' type-id='63632b88' visibility='default' filepath='include/crypto/akcipher.h' line='95' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='decrypt' type-id='63632b88' visibility='default' filepath='include/crypto/akcipher.h' line='96' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <var-decl name='set_pub_key' type-id='22c6c194' visibility='default' filepath='include/crypto/akcipher.h' line='97' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='set_priv_key' type-id='22c6c194' visibility='default' filepath='include/crypto/akcipher.h' line='99' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='max_size' type-id='c7203115' visibility='default' filepath='include/crypto/akcipher.h' line='101' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='init' type-id='f77537f4' visibility='default' filepath='include/crypto/akcipher.h' line='102' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='exit' type-id='a273cbc9' visibility='default' filepath='include/crypto/akcipher.h' line='103' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='576'>
+          <var-decl name='reqsize' type-id='f0981eeb' visibility='default' filepath='include/crypto/akcipher.h' line='105' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1024'>
+          <var-decl name='base' type-id='514fe525' visibility='default' filepath='include/crypto/akcipher.h' line='106' column='1'/>
+        </data-member>
+      </class-decl>
       <pointer-type-def type-id='0156f9e6' size-in-bits='64' id='c55a94d8'/>
       <pointer-type-def type-id='720a6415' size-in-bits='64' id='c55bcf2d'/>
       <class-decl name='dmabuf_page_pool' size-in-bits='896' is-struct='yes' visibility='default' filepath='drivers/dma-buf/heaps/page_pool.h' line='40' column='1' id='c55ce973'>
@@ -90185,6 +90258,7 @@
         <return type-id='95e97e5e'/>
       </function-type>
       <pointer-type-def type-id='fee334bf' size-in-bits='64' id='c71b901b'/>
+      <pointer-type-def type-id='da3e7359' size-in-bits='64' id='c7203115'/>
       <function-type size-in-bits='64' id='c7253970'>
         <parameter type-id='404b1300'/>
         <parameter type-id='95e97e5e'/>
@@ -96752,6 +96826,12 @@
       </union-decl>
       <pointer-type-def type-id='a61b2dc8' size-in-bits='64' id='d74fad0a'/>
       <pointer-type-def type-id='9d05a3e9' size-in-bits='64' id='d764626d'/>
+      <function-type size-in-bits='64' id='d7725d0a'>
+        <parameter type-id='6c4ff4a8'/>
+        <parameter type-id='eaa32e2f'/>
+        <parameter type-id='f0981eeb'/>
+        <return type-id='95e97e5e'/>
+      </function-type>
       <function-type size-in-bits='64' id='d7741e39'>
         <parameter type-id='ec77b5b8'/>
         <return type-id='48b5725f'/>
@@ -97634,6 +97714,10 @@
         <parameter type-id='b7c1d7d5'/>
         <return type-id='48b5725f'/>
       </function-type>
+      <function-type size-in-bits='64' id='da3e7359'>
+        <parameter type-id='6c4ff4a8'/>
+        <return type-id='f0981eeb'/>
+      </function-type>
       <enum-decl name='vdm_states' filepath='drivers/usb/typec/tcpm/tcpm.c' line='205' column='1' id='da4a4188'>
         <underlying-type type-id='9cac1fee'/>
         <enumerator name='VDM_STATE_ERR_BUSY' value='-3'/>
@@ -102773,6 +102857,56 @@
           <var-decl name='s_stream' type-id='6d63cad6' visibility='default' filepath='include/media/v4l2-subdev.h' line='308' column='1'/>
         </data-member>
       </class-decl>
+      <class-decl name='rsa_key' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/crypto/internal/rsa.h' line='31' column='1' id='e395c9f1'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='n' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='32' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='e' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='33' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='d' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='34' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='p' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='35' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <var-decl name='q' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='36' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='dp' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='37' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='dq' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='38' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='qinv' type-id='bbaf3419' visibility='default' filepath='include/crypto/internal/rsa.h' line='39' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='n_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='40' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='576'>
+          <var-decl name='e_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='41' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='640'>
+          <var-decl name='d_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='42' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='704'>
+          <var-decl name='p_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='43' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='768'>
+          <var-decl name='q_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='44' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='832'>
+          <var-decl name='dp_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='45' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='896'>
+          <var-decl name='dq_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='46' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='960'>
+          <var-decl name='qinv_sz' type-id='b59d7dce' visibility='default' filepath='include/crypto/internal/rsa.h' line='47' column='1'/>
+        </data-member>
+      </class-decl>
       <function-type size-in-bits='64' id='e3a1e7d2'>
         <parameter type-id='68a2d05b'/>
         <parameter type-id='5bc7662c'/>
@@ -110146,6 +110280,26 @@
         </data-member>
       </class-decl>
       <pointer-type-def type-id='f962dd87' size-in-bits='64' id='f3e878cb'/>
+      <class-decl name='akcipher_request' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/crypto/akcipher.h' line='33' column='1' id='f3eb0af8'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='base' type-id='5e6083f1' visibility='default' filepath='include/crypto/akcipher.h' line='34' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='src' type-id='bf3ef905' visibility='default' filepath='include/crypto/akcipher.h' line='35' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='dst' type-id='bf3ef905' visibility='default' filepath='include/crypto/akcipher.h' line='36' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='src_len' type-id='f0981eeb' visibility='default' filepath='include/crypto/akcipher.h' line='37' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='544'>
+          <var-decl name='dst_len' type-id='f0981eeb' visibility='default' filepath='include/crypto/akcipher.h' line='38' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1024'>
+          <var-decl name='__ctx' type-id='baf98fd3' visibility='default' filepath='include/crypto/akcipher.h' line='39' column='1'/>
+        </data-member>
+      </class-decl>
       <pointer-type-def type-id='5ba85b48' size-in-bits='64' id='f3f22912'/>
       <function-type size-in-bits='64' id='f3f27ff7'>
         <parameter type-id='a2bff676'/>
@@ -111138,6 +111292,7 @@
       <pointer-type-def type-id='54d829fa' size-in-bits='64' id='f76f0ea4'/>
       <pointer-type-def type-id='a240f41d' size-in-bits='64' id='f772df6d'/>
       <pointer-type-def type-id='e54806c5' size-in-bits='64' id='f774a955'/>
+      <pointer-type-def type-id='b8c3454a' size-in-bits='64' id='f77537f4'/>
       <class-decl name='snd_dec_ape' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/uapi/sound/compress_params.h' line='351' column='1' id='f778b2f8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='compatible_version' type-id='d315442e' visibility='default' filepath='include/uapi/sound/compress_params.h' line='352' column='1'/>
@@ -122663,6 +122818,10 @@
         <parameter type-id='6f3c82ac'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='crypto_ahash_final' mangled-name='crypto_ahash_final' filepath='crypto/ahash.c' line='340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_ahash_final'>
+        <parameter type-id='6f3c82ac' name='req' filepath='crypto/ahash.c' line='340' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='crypto_ahash_finup' mangled-name='crypto_ahash_finup' filepath='include/crypto/hash.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_ahash_finup'>
         <parameter type-id='6f3c82ac'/>
         <return type-id='95e97e5e'/>
@@ -122693,6 +122852,12 @@
         <parameter type-id='19c2251e' name='mask' filepath='crypto/ahash.c' line='556' column='1'/>
         <return type-id='1351523a'/>
       </function-decl>
+      <function-decl name='crypto_alloc_akcipher' mangled-name='crypto_alloc_akcipher' filepath='crypto/akcipher.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_alloc_akcipher'>
+        <parameter type-id='80f4b756' name='alg_name' filepath='crypto/akcipher.c' line='102' column='1'/>
+        <parameter type-id='19c2251e' name='type' filepath='crypto/akcipher.c' line='102' column='1'/>
+        <parameter type-id='19c2251e' name='mask' filepath='crypto/akcipher.c' line='103' column='1'/>
+        <return type-id='6c4ff4a8'/>
+      </function-decl>
       <function-decl name='crypto_alloc_base' mangled-name='crypto_alloc_base' filepath='include/linux/crypto.h' line='676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_alloc_base'>
         <parameter type-id='80f4b756'/>
         <parameter type-id='f0981eeb'/>
@@ -122873,6 +123038,10 @@
         <parameter type-id='95e97e5e' name='count' filepath='crypto/ahash.c' line='603' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='crypto_register_akcipher' mangled-name='crypto_register_akcipher' filepath='crypto/akcipher.c' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_register_akcipher'>
+        <parameter type-id='33cd8a7f' name='alg' filepath='crypto/akcipher.c' line='123' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='crypto_register_alg' mangled-name='crypto_register_alg' filepath='include/linux/crypto.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_register_alg'>
         <parameter type-id='67f526b5'/>
         <return type-id='95e97e5e'/>
@@ -123030,6 +123199,10 @@
         <parameter type-id='16144ad1' name='alg' filepath='crypto/ahash.c' line='597' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='crypto_unregister_akcipher' mangled-name='crypto_unregister_akcipher' filepath='crypto/akcipher.c' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_unregister_akcipher'>
+        <parameter type-id='33cd8a7f' name='alg' filepath='crypto/akcipher.c' line='141' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='crypto_unregister_alg' mangled-name='crypto_unregister_alg' filepath='include/linux/crypto.h' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_unregister_alg'>
         <parameter type-id='67f526b5'/>
         <return type-id='48b5725f'/>
@@ -123462,6 +123635,12 @@
         <parameter type-id='95e97e5e' name='buflen' filepath='fs/d_path.c' line='374' column='1'/>
         <return type-id='26a90f95'/>
       </function-decl>
+      <function-decl name='des_expand_key' mangled-name='des_expand_key' filepath='include/crypto/des.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='des_expand_key'>
+        <parameter type-id='acd39461'/>
+        <parameter type-id='354f7eb9'/>
+        <parameter type-id='f0981eeb'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='desc_to_gpio' mangled-name='desc_to_gpio' filepath='drivers/gpio/gpiolib.c' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='desc_to_gpio'>
         <parameter type-id='5bed570d' name='desc' filepath='drivers/gpio/gpiolib.c' line='164' column='1'/>
         <return type-id='95e97e5e'/>
@@ -139518,6 +139697,18 @@
         <parameter type-id='3dad1a48' name='rq' filepath='block/blk-core.c' line='1531' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='rsa_parse_priv_key' mangled-name='rsa_parse_priv_key' filepath='crypto/rsa_helper.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rsa_parse_priv_key'>
+        <parameter type-id='5663f3d9' name='rsa_key' filepath='crypto/rsa_helper.c' line='181' column='1'/>
+        <parameter type-id='eaa32e2f' name='key' filepath='crypto/rsa_helper.c' line='181' column='1'/>
+        <parameter type-id='f0981eeb' name='key_len' filepath='crypto/rsa_helper.c' line='182' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
+      <function-decl name='rsa_parse_pub_key' mangled-name='rsa_parse_pub_key' filepath='crypto/rsa_helper.c' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rsa_parse_pub_key'>
+        <parameter type-id='5663f3d9' name='rsa_key' filepath='crypto/rsa_helper.c' line='162' column='1'/>
+        <parameter type-id='eaa32e2f' name='key' filepath='crypto/rsa_helper.c' line='162' column='1'/>
+        <parameter type-id='f0981eeb' name='key_len' filepath='crypto/rsa_helper.c' line='163' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='rt_mutex_lock' mangled-name='rt_mutex_lock' filepath='kernel/locking/rtmutex.c' line='1496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rt_mutex_lock'>
         <parameter type-id='3992a90f' name='lock' filepath='kernel/locking/rtmutex.c' line='1496' column='1'/>
         <return type-id='48b5725f'/>
@@ -140692,6 +140883,10 @@
         <parameter type-id='a462f2f9'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='sg_nents' mangled-name='sg_nents' filepath='include/linux/scatterlist.h' line='273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sg_nents'>
+        <parameter type-id='bf3ef905'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='sg_nents_for_len' mangled-name='sg_nents_for_len' filepath='include/linux/scatterlist.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sg_nents_for_len'>
         <parameter type-id='bf3ef905'/>
         <parameter type-id='3a47d82b'/>
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 4431bfa09cb7..2bee0c4c5eb8 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -136,7 +136,16 @@
   cpus_read_unlock
   crc16
   crc32_le
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_ahash_setkey
+  crypto_alloc_aead
+  crypto_alloc_ahash
   crypto_alloc_shash
+  crypto_alloc_skcipher
+  crypto_cipher_encrypt_one
   crypto_destroy_tfm
   crypto_inc
   __crypto_memneq
@@ -144,11 +153,16 @@
   crypto_register_alg
   crypto_register_scomp
   crypto_register_shash
+  crypto_register_template
   crypto_shash_update
+  crypto_skcipher_decrypt
+  crypto_skcipher_encrypt
+  crypto_skcipher_setkey
   crypto_unregister_aead
   crypto_unregister_alg
   crypto_unregister_scomp
   crypto_unregister_shash
+  crypto_unregister_template
   __crypto_xor
   debugfs_attr_read
   debugfs_attr_write
@@ -456,6 +470,7 @@
   find_next_zero_bit
   find_vma
   finish_wait
+  flush_dcache_page
   flush_delayed_work
   flush_work
   flush_workqueue
@@ -703,6 +718,7 @@
   mutex_is_locked
   mutex_lock
   mutex_lock_interruptible
+  mutex_trylock
   mutex_unlock
   __netdev_alloc_skb
   netdev_err
@@ -977,7 +993,9 @@
   sg_alloc_table
   sg_alloc_table_from_pages
   sg_free_table
+  sg_init_one
   sg_init_table
+  sg_nents
   sg_next
   __sg_page_iter_next
   __sg_page_iter_start
@@ -994,9 +1012,12 @@
   skb_push
   skb_put
   skb_trim
+  skcipher_alloc_instance_simple
+  skcipher_register_instance
   skcipher_walk_aead_decrypt
   skcipher_walk_aead_encrypt
   skcipher_walk_done
+  skcipher_walk_virt
   snd_pcm_format_width
   snd_soc_add_component_controls
   snd_soc_card_jack_new
@@ -1522,6 +1543,17 @@
   devm_blk_ksm_init
   mmc_cqe_request_done
 
+# required by cryptodev.ko
+  __close_fd
+  crypto_ahash_final
+  crypto_alloc_akcipher
+  get_user_pages_remote
+  krealloc
+  proc_dointvec
+  register_sysctl_table
+  sg_last
+  unregister_sysctl_table
+
 # required by display-connector.ko
   drm_atomic_get_new_bridge_state
   drm_probe_ddc
@@ -1686,9 +1718,6 @@
 # required by i2c-rk3x.ko
   i2c_parse_fw_timings
 
-# required by iep.ko
-  mutex_trylock
-
 # required by industrialio-buffer-cb.ko
   bitmap_free
   bitmap_zalloc
@@ -1731,18 +1760,9 @@
   arc4_setkey
   call_rcu
   crc32_be
-  crypto_aead_decrypt
-  crypto_aead_encrypt
-  crypto_aead_setauthsize
-  crypto_aead_setkey
-  crypto_alloc_aead
-  crypto_alloc_skcipher
   crypto_shash_digest
   crypto_shash_finup
   crypto_shash_setkey
-  crypto_skcipher_decrypt
-  crypto_skcipher_encrypt
-  crypto_skcipher_setkey
   dev_alloc_name
   dev_fetch_sw_netstats
   dev_queue_xmit
@@ -1783,7 +1803,6 @@
   rht_bucket_nested_insert
   round_jiffies
   round_jiffies_up
-  sg_init_one
   skb_checksum_help
   skb_clone_sk
   skb_complete_wifi_ack
@@ -2107,6 +2126,28 @@
 # required by rk860x-regulator.ko
   regulator_suspend_enable
 
+# required by rk_crypto.ko
+  crypto_ahash_digest
+  crypto_dequeue_request
+  crypto_enqueue_request
+  crypto_init_queue
+  crypto_register_ahash
+  crypto_register_akcipher
+  crypto_register_skcipher
+  crypto_req_done
+  crypto_unregister_ahash
+  crypto_unregister_akcipher
+  crypto_unregister_skcipher
+  des_expand_key
+  rsa_parse_priv_key
+  rsa_parse_pub_key
+  scatterwalk_ffwd
+  sg_copy_from_buffer
+  sg_copy_to_buffer
+  sg_nents_for_len
+  sg_pcopy_from_buffer
+  sg_pcopy_to_buffer
+
 # required by rk_headset_irq_hook_adc.ko
   iio_read_channel_raw
 
@@ -2693,7 +2734,6 @@
   crypto_has_alg
   disk_end_io_acct
   disk_start_io_acct
-  flush_dcache_page
   fsync_bdev
   kstrtou16
   memparse