diff --git a/android-libs/libui.symbols b/android-libs/libui.symbols
index f7cb31d51..61624fde7 100644
--- a/android-libs/libui.symbols
+++ b/android-libs/libui.symbols
@@ -15,35 +15,48 @@ _ZN7android13GraphicBuffer8initSizeEjjij
 _ZN7android13GraphicBuffer8setIndexEi
 _ZN7android13GraphicBuffer9unflattenEPKvjPij
 _ZN7android13GraphicBufferC1EP19ANativeWindowBufferb
+_ZN7android13GraphicBufferC1EP23android_native_buffer_tb
 _ZN7android13GraphicBufferC1Ejjij
 _ZN7android13GraphicBufferC1EjjijjP13native_handleb
+_ZN7android13GraphicBufferC1EjjijjP15native_handle_tb
 _ZN7android13GraphicBufferC1Ev
 _ZN7android13GraphicBufferC2EP19ANativeWindowBufferb
+_ZN7android13GraphicBufferC2EP23android_native_buffer_tb
 _ZN7android13GraphicBufferC2Ejjij
 _ZN7android13GraphicBufferC2EjjijjP13native_handleb
+_ZN7android13GraphicBufferC2EjjijjP15native_handle_tb
 _ZN7android13GraphicBufferC2Ev
 _ZN7android13GraphicBufferD0Ev
 _ZN7android13GraphicBufferD1Ev
 _ZN7android13GraphicBufferD2Ev
 _ZN7android13VirtualKeyMap4loadERKNS_7String8EPPS0_
+_ZN7android15EventRecurrence5parseERKNS_8String16E
 _ZN7android15InputDeviceInfo10initializeEiRKNS_7String8E
 _ZN7android15KeyCharacterMap4loadERKNS_7String8EPPS0_
 _ZN7android15KeyCharacterMap6Parser13parseModifierERKNS_7String8EPi
 _ZN7android19GraphicBufferMapper14registerBufferEPK13native_handle
+_ZN7android19GraphicBufferMapper14registerBufferEPK15native_handle_t
 _ZN7android19GraphicBufferMapper16unregisterBufferEPK13native_handle
+_ZN7android19GraphicBufferMapper16unregisterBufferEPK15native_handle_t
 _ZN7android19GraphicBufferMapper4lockEPK13native_handleiRKNS_4RectEPPv
+_ZN7android19GraphicBufferMapper4lockEPK15native_handle_tiRKNS_4RectEPPv
 _ZN7android19GraphicBufferMapper6unlockEPK13native_handle
+_ZN7android19GraphicBufferMapper6unlockEPK15native_handle_t
 _ZN7android19GraphicBufferMapperC1Ev
 _ZN7android19GraphicBufferMapperC2Ev
+_ZN7android21setKeyboardPropertiesEiRKNS_21InputDeviceIdentifierERKNS_7String8ES5_
 _ZN7android22GraphicBufferAllocator10sAllocListE
 _ZN7android22GraphicBufferAllocator15dumpToSystemLogEv
 _ZN7android22GraphicBufferAllocator4freeEPK13native_handle
+_ZN7android22GraphicBufferAllocator4freeEPK15native_handle_t
 _ZN7android22GraphicBufferAllocator5allocEjjiiPPK13native_handlePi
+_ZN7android22GraphicBufferAllocator5allocEjjiiPPK15native_handle_tPi
 _ZN7android22GraphicBufferAllocator5sLockE
 _ZN7android22GraphicBufferAllocatorC1Ev
 _ZN7android22GraphicBufferAllocatorC2Ev
 _ZN7android22GraphicBufferAllocatorD1Ev
 _ZN7android22GraphicBufferAllocatorD2Ev
+_ZN7android22getKeyCharacterMapFileEiRNS_7String8E
 _ZN7android23FramebufferNativeWindow4dumpERNS_7String8E
 _ZN7android41getInputDeviceConfigurationFilePathByNameERKNS_7String8ENS_32InputDeviceConfigurationFileTypeE
 _ZN7android6KeyMap11probeKeyMapERKNS_21InputDeviceIdentifierERKNS_7String8E
@@ -73,6 +86,13 @@ _ZNK7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBu
 _ZNK7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEE16do_move_backwardEPvPKvj
 _ZNK7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEE7do_copyEPvPKvj
 _ZNK7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEE8do_splatEPvPKvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE10do_compareEPKvSA_
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE10do_destroyEPvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE12do_constructEPvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE15do_move_forwardEPvPKvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE16do_move_backwardEPvPKvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE7do_copyEPvPKvj
+_ZNK7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEE8do_splatEPvPKvj
 _ZNK7android13GraphicBuffer10getFdCountEv
 _ZNK7android13GraphicBuffer15getNativeBufferEv
 _ZNK7android13GraphicBuffer16getFlattenedSizeEv
@@ -82,4 +102,5 @@ _ZNK7android13GraphicBuffer9initCheckEv
 _ZNK7android22GraphicBufferAllocator4dumpERNS_7String8E
 _ZNK7android6Region4dumpERNS_7String8EPKcj
 _ZTVN7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE
+_ZTVN7android12SortedVectorINS_16key_value_pair_tIPK15native_handle_tNS_22GraphicBufferAllocator11alloc_rec_tEEEEE
 _ZTVN7android13GraphicBufferE
diff --git a/dump-libs.sh b/dump-libs.sh
index e470b8db1..6f8f9f370 100755
--- a/dump-libs.sh
+++ b/dump-libs.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-for i in stagefright media utils cutils binder ui; do
+for i in stagefright media utils cutils binder ui ui-hc; do
 	nm -D --defined-only lib$i.so | awk '{print $3}' | grep -v ^__aeabi | grep '\(IInterface\|OMXObserver\|MemoryDealer\|Binder\|RefBase\|String\|OMXClient\|IMemory\|GraphicBuffer\|android_atomic\|^str\)' > lib$i.symbols
 done
 
+cat libui.symbols libui-hc.symbols | sort | uniq > tmp
+mv tmp libui.symbols
+rm -f libui-hc.symbols
+