diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index d2cc09048ee0..fa80fac5fa33 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -8553,6 +8553,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x7a249348
 }
+pointer_reference {
+  id: 0x14199568
+  kind: POINTER
+  pointee_type_id: 0x7a26b33d
+}
 pointer_reference {
   id: 0x141d28a8
   kind: POINTER
@@ -9048,6 +9053,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x71511504
 }
+pointer_reference {
+  id: 0x16c5c0ab
+  kind: POINTER
+  pointee_type_id: 0x7157e430
+}
 pointer_reference {
   id: 0x16df644d
   kind: POINTER
@@ -44113,6 +44123,12 @@ member {
   type_id: 0x18bd6530
   offset: 384
 }
+member {
+  id: 0xd5613ffc
+  name: "afbc_size"
+  type_id: 0xc9082b19
+  offset: 1760
+}
 member {
   id: 0x9aeabf13
   name: "afc"
@@ -44434,6 +44450,18 @@ member {
   type_id: 0x0b395893
   offset: 8192
 }
+member {
+  id: 0xdeafe619
+  name: "aligned_height"
+  type_id: 0xc9082b19
+  offset: 1696
+}
+member {
+  id: 0x6db01f09
+  name: "aligned_width"
+  type_id: 0xc9082b19
+  offset: 1664
+}
 member {
   id: 0x9d7710c5
   name: "alignmask"
@@ -51502,6 +51530,11 @@ member {
   name: "base"
   type_id: 0xec967f20
 }
+member {
+  id: 0x85378cb8
+  name: "base"
+  type_id: 0xed62338c
+}
 member {
   id: 0x8544c9f4
   name: "base"
@@ -53572,6 +53605,12 @@ member {
   type_id: 0x861a0f9a
   offset: 112
 }
+member {
+  id: 0xdb864134
+  name: "block_height"
+  type_id: 0xc9082b19
+  offset: 1632
+}
 member {
   id: 0x215a13ec
   name: "block_len"
@@ -53638,6 +53677,12 @@ member {
   type_id: 0x861a0f9a
   offset: 104
 }
+member {
+  id: 0x3b9c97de
+  name: "block_width"
+  type_id: 0xc9082b19
+  offset: 1600
+}
 member {
   id: 0x82470e87
   name: "blocked"
@@ -138577,6 +138622,12 @@ member {
   type_id: 0xdd6eef0a
   offset: 128
 }
+member {
+  id: 0x9bd5d3ca
+  name: "offset"
+  type_id: 0xc9082b19
+  offset: 1728
+}
 member {
   id: 0x9bd5d4ef
   name: "offset"
@@ -222671,6 +222722,21 @@ struct_union {
     member_id: 0xd47cf744
   }
 }
+struct_union {
+  id: 0x7a26b33d
+  kind: STRUCT
+  name: "drm_afbc_framebuffer"
+  definition {
+    bytesize: 224
+    member_id: 0x85378cb8
+    member_id: 0x3b9c97de
+    member_id: 0xdb864134
+    member_id: 0x6db01f09
+    member_id: 0xdeafe619
+    member_id: 0x9bd5d3ca
+    member_id: 0xd5613ffc
+  }
+}
 struct_union {
   id: 0x9cb7b96f
   kind: STRUCT
@@ -297672,6 +297738,12 @@ function {
   parameter_id: 0x0cbf60eb
   parameter_id: 0x2b20aa80
 }
+function {
+  id: 0x44b624d1
+  return_type_id: 0x00c83ba6
+  parameter_id: 0x3b04bead
+  parameter_id: 0x16c5c0ab
+}
 function {
   id: 0x44ddb78b
   return_type_id: 0x356691bc
@@ -297717,6 +297789,12 @@ function {
   parameter_id: 0x3860f3c0
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x45df5dd3
+  return_type_id: 0x315b7e01
+  parameter_id: 0x3b04bead
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x45f82b62
   return_type_id: 0xc9082b19
@@ -298257,6 +298335,13 @@ function {
   parameter_id: 0x2936263d
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0x5274946d
+  return_type_id: 0x1c898f28
+  parameter_id: 0x356691bc
+  parameter_id: 0x6720d32f
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x5281433c
   return_type_id: 0x92233392
@@ -304785,6 +304870,13 @@ function {
   parameter_id: 0x3b04bead
   parameter_id: 0x4585663f
 }
+function {
+  id: 0x9258444e
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3b04bead
+  parameter_id: 0x4585663f
+  parameter_id: 0x3e75499e
+}
 function {
   id: 0x925d3e48
   return_type_id: 0x6720d32f
@@ -306126,6 +306218,16 @@ function {
   parameter_id: 0x13580d6c
   parameter_id: 0x07dcdbe1
 }
+function {
+  id: 0x93625762
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3b04bead
+  parameter_id: 0x079f969f
+  parameter_id: 0xf435685e
+  parameter_id: 0x391f15ea
+  parameter_id: 0x30ccee09
+  parameter_id: 0x2a670b41
+}
 function {
   id: 0x93627fe0
   return_type_id: 0x6720d32f
@@ -306233,6 +306335,15 @@ function {
   parameter_id: 0x3e10b518
   parameter_id: 0xa52a0930
 }
+function {
+  id: 0x938283cb
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3b04bead
+  parameter_id: 0x31c8b544
+  parameter_id: 0x12e6ffae
+  parameter_id: 0x36d2de0e
+  parameter_id: 0x3db894b0
+}
 function {
   id: 0x93833601
   return_type_id: 0x6720d32f
@@ -306404,6 +306515,13 @@ function {
   parameter_id: 0x4585663f
   parameter_id: 0x0b27dc43
 }
+function {
+  id: 0x939f8199
+  return_type_id: 0x6720d32f
+  parameter_id: 0x3b04bead
+  parameter_id: 0x36d2de0e
+  parameter_id: 0x14199568
+}
 function {
   id: 0x93a2a3d7
   return_type_id: 0x6720d32f
@@ -309208,6 +309326,12 @@ function {
   parameter_id: 0x391f15ea
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x974e1bca
+  return_type_id: 0x6720d32f
+  parameter_id: 0x2953a412
+  parameter_id: 0x26847863
+}
 function {
   id: 0x975a548f
   return_type_id: 0x6720d32f
@@ -311796,6 +311920,14 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x92233392
 }
+function {
+  id: 0x99e7b457
+  return_type_id: 0x6720d32f
+  parameter_id: 0x12e6ffae
+  parameter_id: 0x3b04bead
+  parameter_id: 0xc9082b19
+  parameter_id: 0x2e18f543
+}
 function {
   id: 0x99eacf10
   return_type_id: 0x6720d32f
@@ -314614,6 +314746,14 @@ function {
   parameter_id: 0xc9082b19
   parameter_id: 0x17b3f4e8
 }
+function {
+  id: 0x9b723218
+  return_type_id: 0x2a670b41
+  parameter_id: 0x3b04bead
+  parameter_id: 0xc9082b19
+  parameter_id: 0x3e10b518
+  parameter_id: 0x1c3dbe5a
+}
 function {
   id: 0x9b7237ea
   return_type_id: 0x2a670b41
@@ -323814,6 +323954,12 @@ function {
   return_type_id: 0x6720d32f
   parameter_id: 0xb0ddb211
 }
+function {
+  id: 0xb28c48b5
+  return_type_id: 0x067c4b9a
+  parameter_id: 0x358ff5b7
+  parameter_id: 0x31b5a66f
+}
 function {
   id: 0xb2be15b9
   return_type_id: 0x6720d32f
@@ -323844,6 +323990,13 @@ function {
   parameter_id: 0x315b7e01
   parameter_id: 0x358ff5b7
 }
+function {
+  id: 0xb3cfd554
+  return_type_id: 0x067c4b9a
+  parameter_id: 0x358ff5b7
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0xb3df35fa
   return_type_id: 0x06835e9c
@@ -324038,6 +324191,14 @@ function {
   parameter_id: 0x1344d43c
   parameter_id: 0xf1a6dfed
 }
+function {
+  id: 0xba97bb1d
+  return_type_id: 0x6720d32f
+  parameter_id: 0x9565759f
+  parameter_id: 0x9565759f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x33d50b40
+}
 function {
   id: 0xbb40a305
   return_type_id: 0x6720d32f
@@ -326362,6 +326523,12 @@ function {
   parameter_id: 0x1b55a8f2
   parameter_id: 0x4585663f
 }
+function {
+  id: 0xf272e262
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x31b5a66f
+  parameter_id: 0x2ef43f67
+}
 function {
   id: 0xf275a972
   return_type_id: 0x6d7f5ff6
@@ -328688,6 +328855,15 @@ elf_symbol {
   type_id: 0x1c25e791
   full_name: "__drm_atomic_helper_crtc_reset"
 }
+elf_symbol {
+  id: 0xa061e45d
+  name: "__drm_atomic_helper_disable_plane"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3695d680
+  type_id: 0x9bf37946
+  full_name: "__drm_atomic_helper_disable_plane"
+}
 elf_symbol {
   id: 0xec903c93
   name: "__drm_atomic_helper_plane_destroy_state"
@@ -342741,6 +342917,15 @@ elf_symbol {
   type_id: 0x9d7428e0
   full_name: "component_bind_all"
 }
+elf_symbol {
+  id: 0x9901e8ee
+  name: "component_compare_dev"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0b549846
+  type_id: 0x9d7428e0
+  full_name: "component_compare_dev"
+}
 elf_symbol {
   id: 0x4bc5faef
   name: "component_compare_dev_name"
@@ -349530,6 +349715,15 @@ elf_symbol {
   type_id: 0x9068c1cc
   full_name: "drm_add_modes_noedid"
 }
+elf_symbol {
+  id: 0x7e8263f6
+  name: "drm_aperture_remove_conflicting_framebuffers"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa5abe6ba
+  type_id: 0xba97bb1d
+  full_name: "drm_aperture_remove_conflicting_framebuffers"
+}
 elf_symbol {
   id: 0x588ab3fd
   name: "drm_aperture_remove_conflicting_pci_framebuffers"
@@ -350376,6 +350570,24 @@ elf_symbol {
   type_id: 0xfcf090be
   full_name: "drm_bridge_detect"
 }
+elf_symbol {
+  id: 0x3ef0db06
+  name: "drm_bridge_get_edid"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xdeb653ce
+  type_id: 0xc7bc0e4a
+  full_name: "drm_bridge_get_edid"
+}
+elf_symbol {
+  id: 0xc72378aa
+  name: "drm_bridge_get_modes"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8446a07e
+  type_id: 0x94dc0c27
+  full_name: "drm_bridge_get_modes"
+}
 elf_symbol {
   id: 0xd82232b3
   name: "drm_bridge_hpd_notify"
@@ -350511,6 +350723,15 @@ elf_symbol {
   type_id: 0x1cf53808
   full_name: "drm_connector_cleanup"
 }
+elf_symbol {
+  id: 0xf8bd92c8
+  name: "drm_connector_has_possible_encoder"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x2e4b4a64
+  type_id: 0xf272e262
+  full_name: "drm_connector_has_possible_encoder"
+}
 elf_symbol {
   id: 0x70b7d94b
   name: "drm_connector_init"
@@ -350655,6 +350876,15 @@ elf_symbol {
   type_id: 0x1e67551a
   full_name: "drm_crtc_enable_color_mgmt"
 }
+elf_symbol {
+  id: 0x08309f5e
+  name: "drm_crtc_from_index"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x34429a5e
+  type_id: 0x45df5dd3
+  full_name: "drm_crtc_from_index"
+}
 elf_symbol {
   id: 0x11e9361c
   name: "drm_crtc_handle_vblank"
@@ -351159,6 +351389,15 @@ elf_symbol {
   type_id: 0xc21e59d8
   full_name: "drm_format_info_block_width"
 }
+elf_symbol {
+  id: 0x4b9e6227
+  name: "drm_format_info_min_pitch"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6910e4cd
+  type_id: 0x5274946d
+  full_name: "drm_format_info_min_pitch"
+}
 elf_symbol {
   id: 0x9c6b68f2
   name: "drm_framebuffer_cleanup"
@@ -351222,6 +351461,15 @@ elf_symbol {
   type_id: 0x9398dfdf
   full_name: "drm_gem_create_mmap_offset"
 }
+elf_symbol {
+  id: 0xd4d38d4c
+  name: "drm_gem_dmabuf_export"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x9af5812d
+  type_id: 0x44b624d1
+  full_name: "drm_gem_dmabuf_export"
+}
 elf_symbol {
   id: 0x81bdff8a
   name: "drm_gem_dmabuf_mmap"
@@ -351258,6 +351506,24 @@ elf_symbol {
   type_id: 0x10563618
   full_name: "drm_gem_dmabuf_vunmap"
 }
+elf_symbol {
+  id: 0xac1aeaf0
+  name: "drm_gem_dumb_map_offset"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8220a182
+  type_id: 0x99e7b457
+  full_name: "drm_gem_dumb_map_offset"
+}
+elf_symbol {
+  id: 0x622cdd92
+  name: "drm_gem_fb_afbc_init"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x38ebad6a
+  type_id: 0x939f8199
+  full_name: "drm_gem_fb_afbc_init"
+}
 elf_symbol {
   id: 0xc7970f23
   name: "drm_gem_fb_begin_cpu_access"
@@ -351303,6 +351569,15 @@ elf_symbol {
   type_id: 0x0bfc976c
   full_name: "drm_gem_fb_get_obj"
 }
+elf_symbol {
+  id: 0x585410d0
+  name: "drm_gem_fb_init_with_funcs"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x882550af
+  type_id: 0x938283cb
+  full_name: "drm_gem_fb_init_with_funcs"
+}
 elf_symbol {
   id: 0xd4a13963
   name: "drm_gem_fb_vmap"
@@ -351987,6 +352262,15 @@ elf_symbol {
   type_id: 0x19394f8b
   full_name: "drm_mm_remove_node"
 }
+elf_symbol {
+  id: 0xd0dd3133
+  name: "drm_mm_reserve_node"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x2754dad8
+  type_id: 0x974e1bca
+  full_name: "drm_mm_reserve_node"
+}
 elf_symbol {
   id: 0x3b867568
   name: "drm_mm_scan_add_block"
@@ -352131,6 +352415,15 @@ elf_symbol {
   type_id: 0x42ee3dd4
   full_name: "drm_mode_create_tile_group"
 }
+elf_symbol {
+  id: 0x0d3b6723
+  name: "drm_mode_create_tv_properties"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x30d9d722
+  type_id: 0x9258444e
+  full_name: "drm_mode_create_tv_properties"
+}
 elf_symbol {
   id: 0x58b810bd
   name: "drm_mode_crtc_set_gamma_size"
@@ -352194,6 +352487,15 @@ elf_symbol {
   type_id: 0xc6a0fd0e
   full_name: "drm_mode_find_dmt"
 }
+elf_symbol {
+  id: 0xc3ae75b9
+  name: "drm_mode_is_420"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x8c35d2cf
+  type_id: 0xf10b3730
+  full_name: "drm_mode_is_420"
+}
 elf_symbol {
   id: 0xca851619
   name: "drm_mode_is_420_also"
@@ -352293,6 +352595,33 @@ elf_symbol {
   type_id: 0x1f00dfeb
   full_name: "drm_mode_sort"
 }
+elf_symbol {
+  id: 0x003f0aec
+  name: "drm_mode_validate_driver"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x952d25ca
+  type_id: 0xb13e733c
+  full_name: "drm_mode_validate_driver"
+}
+elf_symbol {
+  id: 0x43bb72ae
+  name: "drm_mode_validate_size"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd7a9cf42
+  type_id: 0xb3cfd554
+  full_name: "drm_mode_validate_size"
+}
+elf_symbol {
+  id: 0x49fd657a
+  name: "drm_mode_validate_ycbcr420"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xcb2c6fb3
+  type_id: 0xb28c48b5
+  full_name: "drm_mode_validate_ycbcr420"
+}
 elf_symbol {
   id: 0x4e6bfabc
   name: "drm_mode_vrefresh"
@@ -352437,6 +352766,15 @@ elf_symbol {
   type_id: 0x9dad5a62
   full_name: "drm_of_component_probe"
 }
+elf_symbol {
+  id: 0xdb6eae3a
+  name: "drm_of_crtc_port_mask"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf557a5fd
+  type_id: 0x3d0f6874
+  full_name: "drm_of_crtc_port_mask"
+}
 elf_symbol {
   id: 0x122e3e9f
   name: "drm_of_encoder_active_endpoint"
@@ -352824,6 +353162,15 @@ elf_symbol {
   type_id: 0x9b72aa8f
   full_name: "drm_property_create_enum"
 }
+elf_symbol {
+  id: 0x8d62d3e1
+  name: "drm_property_create_object"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6e0229f2
+  type_id: 0x9b723218
+  full_name: "drm_property_create_object"
+}
 elf_symbol {
   id: 0x7a4db2f9
   name: "drm_property_create_range"
@@ -352869,6 +353216,15 @@ elf_symbol {
   type_id: 0xff934450
   full_name: "drm_property_replace_blob"
 }
+elf_symbol {
+  id: 0x4cf5ba17
+  name: "drm_property_replace_global_blob"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd2ff27b8
+  type_id: 0x93625762
+  full_name: "drm_property_replace_global_blob"
+}
 elf_symbol {
   id: 0x9718e72e
   name: "drm_puts"
@@ -364614,6 +364970,15 @@ elf_symbol {
   type_id: 0xf4f34784
   full_name: "mipi_dsi_packet_format_is_long"
 }
+elf_symbol {
+  id: 0xb6dbcbcc
+  name: "mipi_dsi_packet_format_is_short"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x238b099f
+  type_id: 0xf4f34784
+  full_name: "mipi_dsi_packet_format_is_short"
+}
 elf_symbol {
   id: 0xdca2a3c4
   name: "mipi_dsi_picture_parameter_set"
@@ -367431,6 +367796,15 @@ elf_symbol {
   type_id: 0x796e9f62
   full_name: "of_graph_get_remote_node"
 }
+elf_symbol {
+  id: 0x9539ac95
+  name: "of_graph_get_remote_port"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc8fcc975
+  type_id: 0x7a78fdc4
+  full_name: "of_graph_get_remote_port"
+}
 elf_symbol {
   id: 0xc699a239
   name: "of_graph_get_remote_port_parent"
@@ -391413,6 +391787,7 @@ interface {
   symbol_id: 0x1c1ee265
   symbol_id: 0x77466fa6
   symbol_id: 0x0b0f732e
+  symbol_id: 0xa061e45d
   symbol_id: 0xec903c93
   symbol_id: 0x7149b35b
   symbol_id: 0x04e4be20
@@ -392975,6 +393350,7 @@ interface {
   symbol_id: 0x0356dc1d
   symbol_id: 0x53eb2602
   symbol_id: 0xcce97787
+  symbol_id: 0x9901e8ee
   symbol_id: 0x4bc5faef
   symbol_id: 0xa06e08e9
   symbol_id: 0x98bdb018
@@ -393728,6 +394104,7 @@ interface {
   symbol_id: 0xe5349379
   symbol_id: 0xb7abbec5
   symbol_id: 0x573a436c
+  symbol_id: 0x7e8263f6
   symbol_id: 0x588ab3fd
   symbol_id: 0x1389094c
   symbol_id: 0x098d4189
@@ -393822,6 +394199,8 @@ interface {
   symbol_id: 0x0dfe64b8
   symbol_id: 0x51b726c8
   symbol_id: 0x5d9f16f7
+  symbol_id: 0x3ef0db06
+  symbol_id: 0xc72378aa
   symbol_id: 0xd82232b3
   symbol_id: 0x69a31cde
   symbol_id: 0xfbc28ac3
@@ -393837,6 +394216,7 @@ interface {
   symbol_id: 0x1cc3ba5d
   symbol_id: 0xf01aa08a
   symbol_id: 0x7fe4fd87
+  symbol_id: 0xf8bd92c8
   symbol_id: 0x70b7d94b
   symbol_id: 0x3b6d3ed0
   symbol_id: 0xcda9ec73
@@ -393853,6 +394233,7 @@ interface {
   symbol_id: 0xc8580afc
   symbol_id: 0xbe89afca
   symbol_id: 0x3b7c3802
+  symbol_id: 0x08309f5e
   symbol_id: 0x11e9361c
   symbol_id: 0x98de519f
   symbol_id: 0x49bf35a9
@@ -393909,6 +394290,7 @@ interface {
   symbol_id: 0xaad93a6e
   symbol_id: 0x820af79e
   symbol_id: 0xf5a866d4
+  symbol_id: 0x4b9e6227
   symbol_id: 0x9c6b68f2
   symbol_id: 0x8ab89d74
   symbol_id: 0x717f2784
@@ -393916,15 +394298,19 @@ interface {
   symbol_id: 0x88d310ca
   symbol_id: 0x596f41bc
   symbol_id: 0xcf21a814
+  symbol_id: 0xd4d38d4c
   symbol_id: 0x81bdff8a
   symbol_id: 0xeba98304
   symbol_id: 0x48e94357
   symbol_id: 0x6cbff317
+  symbol_id: 0xac1aeaf0
+  symbol_id: 0x622cdd92
   symbol_id: 0xc7970f23
   symbol_id: 0x5758ca8d
   symbol_id: 0x8f687080
   symbol_id: 0x128b55c8
   symbol_id: 0xd2191311
+  symbol_id: 0x585410d0
   symbol_id: 0xd4a13963
   symbol_id: 0xa09bde3a
   symbol_id: 0xaef6523a
@@ -394001,6 +394387,7 @@ interface {
   symbol_id: 0x93c0dba2
   symbol_id: 0xd7cfff98
   symbol_id: 0xecb4d16d
+  symbol_id: 0xd0dd3133
   symbol_id: 0x3b867568
   symbol_id: 0xc5806cb6
   symbol_id: 0xd48e0164
@@ -394017,6 +394404,7 @@ interface {
   symbol_id: 0xbe3f1757
   symbol_id: 0x64649d2c
   symbol_id: 0x51b5201f
+  symbol_id: 0x0d3b6723
   symbol_id: 0x58b810bd
   symbol_id: 0x23e302cb
   symbol_id: 0x9a3d3812
@@ -394024,6 +394412,7 @@ interface {
   symbol_id: 0xa6782aae
   symbol_id: 0x648de106
   symbol_id: 0xe96cf682
+  symbol_id: 0xc3ae75b9
   symbol_id: 0xca851619
   symbol_id: 0x6a50bad9
   symbol_id: 0x1183a93d
@@ -394035,6 +394424,9 @@ interface {
   symbol_id: 0x76120529
   symbol_id: 0x7a8a4736
   symbol_id: 0x3f8952ab
+  symbol_id: 0x003f0aec
+  symbol_id: 0x43bb72ae
+  symbol_id: 0x49fd657a
   symbol_id: 0x4e6bfabc
   symbol_id: 0x935fb0ee
   symbol_id: 0xe5fad629
@@ -394051,6 +394443,7 @@ interface {
   symbol_id: 0x0cf86849
   symbol_id: 0x6f8184d5
   symbol_id: 0x8aa099dd
+  symbol_id: 0xdb6eae3a
   symbol_id: 0x122e3e9f
   symbol_id: 0xc0d6517a
   symbol_id: 0xd479c471
@@ -394094,11 +394487,13 @@ interface {
   symbol_id: 0x3bb33b54
   symbol_id: 0x8da7c819
   symbol_id: 0x808bdf9f
+  symbol_id: 0x8d62d3e1
   symbol_id: 0x7a4db2f9
   symbol_id: 0xb96f3f15
   symbol_id: 0xafb178b7
   symbol_id: 0xceb76dac
   symbol_id: 0xb1f5cc24
+  symbol_id: 0x4cf5ba17
   symbol_id: 0x9718e72e
   symbol_id: 0x8da70bb5
   symbol_id: 0xc84875f6
@@ -395404,6 +395799,7 @@ interface {
   symbol_id: 0xd08cb4e7
   symbol_id: 0x596b8466
   symbol_id: 0xd9f124cf
+  symbol_id: 0xb6dbcbcc
   symbol_id: 0xdca2a3c4
   symbol_id: 0x6d579aaf
   symbol_id: 0xe4059d72
@@ -395717,6 +396113,7 @@ interface {
   symbol_id: 0xd3bfa538
   symbol_id: 0x1544acf1
   symbol_id: 0xacdbe7cb
+  symbol_id: 0x9539ac95
   symbol_id: 0xc699a239
   symbol_id: 0xe63f0c53
   symbol_id: 0x8be0e5f9
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 8c21914afe6d..8159959b2849 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -286,6 +286,108 @@
   down_read
   down_write
   driver_unregister
+  drm_add_edid_modes
+  drm_add_modes_noedid
+  drm_atomic_get_connector_state
+  drm_atomic_get_crtc_state
+  drm_atomic_get_new_connector_for_encoder
+  drm_atomic_helper_bridge_destroy_state
+  drm_atomic_helper_bridge_duplicate_state
+  drm_atomic_helper_bridge_propagate_bus_fmt
+  drm_atomic_helper_bridge_reset
+  drm_atomic_helper_connector_destroy_state
+  drm_atomic_helper_connector_duplicate_state
+  drm_atomic_helper_connector_reset
+  drm_bridge_add
+  drm_bridge_attach
+  drm_bridge_detect
+  drm_bridge_get_modes
+  drm_bridge_hpd_notify
+  drm_bridge_remove
+  drm_compat_ioctl
+  drm_connector_attach_encoder
+  drm_connector_cleanup
+  drm_connector_has_possible_encoder
+  drm_connector_init
+  drm_connector_init_with_ddc
+  drm_connector_list_iter_begin
+  drm_connector_list_iter_end
+  drm_connector_list_iter_next
+  drm_connector_unregister
+  drm_connector_update_edid_property
+  ___drm_dbg
+  drm_detect_hdmi_monitor
+  drm_detect_monitor_audio
+  drm_dev_alloc
+  __drm_dev_dbg
+  drm_dev_printk
+  drm_dev_put
+  drm_dev_register
+  drm_dev_unregister
+  drm_display_info_set_bus_formats
+  drm_display_mode_from_videomode
+  drm_display_mode_to_videomode
+  __drm_err
+  drm_gem_dumb_map_offset
+  drm_gem_get_pages
+  drm_gem_handle_create
+  drm_gem_mmap
+  drm_gem_object_free
+  drm_gem_object_init
+  drm_gem_object_lookup
+  drm_gem_object_release
+  drm_gem_prime_fd_to_handle
+  drm_gem_prime_handle_to_fd
+  drm_gem_prime_mmap
+  drm_gem_put_pages
+  drm_gem_vm_close
+  drm_gem_vm_open
+  drm_get_edid
+  drm_hdmi_avi_infoframe_from_display_mode
+  drm_hdmi_avi_infoframe_quant_range
+  drm_hdmi_vendor_infoframe_from_display_mode
+  drm_helper_hpd_irq_event
+  drm_helper_probe_single_connector_modes
+  drm_ioctl
+  drm_kms_helper_hotplug_event
+  drm_kms_helper_is_poll_worker
+  drm_match_cea_mode
+  drm_mode_copy
+  drm_mode_create
+  drm_mode_duplicate
+  drm_mode_is_420_also
+  drm_mode_is_420_only
+  drm_mode_object_put
+  drm_mode_probed_add
+  drm_modeset_acquire_fini
+  drm_modeset_acquire_init
+  drm_modeset_backoff
+  drm_modeset_drop_locks
+  drm_modeset_lock
+  drm_mode_set_name
+  drm_modeset_unlock
+  drm_mode_validate_driver
+  drm_mode_vrefresh
+  drm_object_attach_property
+  drm_of_find_panel_or_bridge
+  drm_open
+  drm_panel_add
+  drm_panel_disable
+  drm_panel_enable
+  drm_panel_get_modes
+  drm_panel_init
+  drm_panel_prepare
+  drm_panel_unprepare
+  drm_poll
+  drm_prime_gem_destroy
+  drm_prime_get_contiguous_size
+  drm_prime_pages_to_sg
+  drm_prime_sg_to_page_array
+  drm_printf
+  drm_property_create_enum
+  drm_property_replace_global_blob
+  drm_read
+  drm_release
   dummy_irq_chip
   enable_irq
   eth_mac_addr
@@ -1903,6 +2005,166 @@
   thermal_zone_device_enable
   thermal_zone_device_update
 
+# required by rockchipdrm.ko
+  adjust_managed_page_count
+  component_add
+  component_bind_all
+  component_compare_dev
+  component_del
+  component_master_add_with_match
+  component_master_del
+  component_match_add_release
+  component_unbind_all
+  devm_of_phy_get_by_index
+  driver_find_device
+  drm_aperture_remove_conflicting_framebuffers
+  drm_atomic_commit
+  drm_atomic_get_plane_state
+  drm_atomic_helper_check
+  drm_atomic_helper_check_plane_state
+  drm_atomic_helper_cleanup_planes
+  drm_atomic_helper_commit
+  drm_atomic_helper_commit_hw_done
+  drm_atomic_helper_commit_modeset_disables
+  drm_atomic_helper_commit_modeset_enables
+  drm_atomic_helper_commit_planes
+  __drm_atomic_helper_connector_destroy_state
+  __drm_atomic_helper_connector_duplicate_state
+  __drm_atomic_helper_connector_reset
+  __drm_atomic_helper_crtc_destroy_state
+  __drm_atomic_helper_crtc_duplicate_state
+  __drm_atomic_helper_disable_plane
+  drm_atomic_helper_duplicate_state
+  drm_atomic_helper_fake_vblank
+  drm_atomic_helper_page_flip
+  __drm_atomic_helper_plane_destroy_state
+  __drm_atomic_helper_plane_duplicate_state
+  __drm_atomic_helper_plane_reset
+  drm_atomic_helper_set_config
+  drm_atomic_helper_shutdown
+  drm_atomic_helper_swap_state
+  drm_atomic_helper_wait_for_vblanks
+  drm_atomic_set_crtc_for_connector
+  drm_atomic_set_crtc_for_plane
+  drm_atomic_set_fb_for_plane
+  drm_atomic_set_mode_for_crtc
+  drm_atomic_state_alloc
+  __drm_atomic_state_free
+  drm_bridge_chain_mode_set
+  drm_bridge_get_edid
+  drm_connector_list_update
+  drm_crtc_cleanup
+  drm_crtc_enable_color_mgmt
+  drm_crtc_from_index
+  drm_crtc_handle_vblank
+  drm_crtc_init_with_planes
+  drm_crtc_send_vblank_event
+  drm_crtc_vblank_get
+  drm_crtc_vblank_off
+  drm_crtc_vblank_on
+  drm_crtc_vblank_put
+  drm_do_get_edid
+  drm_encoder_cleanup
+  drm_encoder_init
+  drm_event_reserve_init_locked
+  drm_firmware_drivers_only
+  drm_flip_work_cleanup
+  drm_flip_work_commit
+  drm_flip_work_init
+  drm_flip_work_queue
+  drm_format_info
+  drm_format_info_min_pitch
+  drm_framebuffer_cleanup
+  drm_framebuffer_init
+  drm_gem_dmabuf_export
+  drm_gem_dmabuf_mmap
+  drm_gem_dmabuf_release
+  drm_gem_dmabuf_vmap
+  drm_gem_dmabuf_vunmap
+  drm_gem_fb_afbc_init
+  drm_gem_fb_create_handle
+  drm_gem_fb_init_with_funcs
+  drm_gem_map_attach
+  drm_gem_map_detach
+  drm_gem_map_dma_buf
+  drm_gem_unmap_dma_buf
+  drm_get_format_info
+  drm_helper_mode_fill_fb_struct
+  drm_kms_helper_poll_enable
+  drm_kms_helper_poll_fini
+  drm_kms_helper_poll_init
+  drm_mm_init
+  drm_mm_insert_node_in_range
+  drmm_mode_config_init
+  drm_mm_print
+  drm_mm_remove_node
+  drm_mm_reserve_node
+  drm_mm_takedown
+  drm_mode_config_cleanup
+  drm_mode_config_helper_resume
+  drm_mode_config_helper_suspend
+  drm_mode_config_reset
+  drm_mode_create_hdmi_colorspace_property
+  drm_mode_create_tv_properties
+  drm_mode_crtc_set_gamma_size
+  drm_mode_debug_printmodeline
+  drm_mode_is_420
+  drm_mode_object_get
+  drm_mode_prune_invalid
+  drm_mode_set_crtcinfo
+  drm_modeset_lock_all
+  drm_modeset_unlock_all
+  drm_mode_sort
+  drm_mode_validate_size
+  drm_mode_validate_ycbcr420
+  drm_of_crtc_port_mask
+  drm_of_encoder_active_endpoint
+  drm_plane_cleanup
+  drm_plane_create_alpha_property
+  drm_plane_create_blend_mode_property
+  drm_plane_create_rotation_property
+  drm_plane_create_zpos_property
+  __drm_printfn_seq_file
+  drm_property_blob_get
+  drm_property_blob_put
+  drm_property_create
+  drm_property_create_bitmask
+  drm_property_create_bool
+  drm_property_create_object
+  drm_property_create_range
+  drm_property_destroy
+  drm_property_lookup_blob
+  drm_property_replace_blob
+  __drm_puts_seq_file
+  drm_rect_calc_hscale
+  drm_self_refresh_helper_cleanup
+  drm_self_refresh_helper_init
+  drm_send_event_locked
+  drm_simple_encoder_init
+  drm_universal_plane_init
+  drm_vblank_init
+  drm_writeback_connector_init
+  drm_writeback_queue_job
+  drm_writeback_signal_completion
+  hdmi_drm_infoframe_pack_only
+  iommu_domain_alloc
+  iommu_domain_free
+  memblock_free
+  mipi_dsi_packet_format_is_short
+  of_clk_set_defaults
+  of_find_backlight_by_node
+  of_fwnode_ops
+  of_get_next_parent
+  of_graph_get_port_by_id
+  of_graph_get_remote_endpoint
+  of_graph_get_remote_port
+  phy_mipi_dphy_get_default_config
+  platform_find_device_by_driver
+  __platform_register_drivers
+  platform_unregister_drivers
+  system_unbound_wq
+  __vmalloc
+
 # required by rtc-rk808.ko
   rtc_update_irq