am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."

* commit 'b257bb8ab4a18e6683aec64389305e179f6eb86b':
  ndk: x86: Sanitize platform headers and libraries.

218 files changed, 2125 insertions, 17 deletions

diff --git a/ndk/platforms/android-3/arch-x86/lib/crtbegin_dynamic.o b/ndk/platforms/android-3/arch-x86/lib/crtbegin_dynamic.o
deleted file mode 100644
index c620c30ba..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/crtbegin_dynamic.o
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/crtbegin_static.o b/ndk/platforms/android-3/arch-x86/lib/crtbegin_static.o
deleted file mode 100644
index c7505ee8c..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/crtbegin_static.o
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/crtend_android.o b/ndk/platforms/android-3/arch-x86/lib/crtend_android.o
deleted file mode 100644
index 2a835b7d4..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/crtend_android.o
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libc.a b/ndk/platforms/android-3/arch-x86/lib/libc.a
deleted file mode 100644
index 15403b190..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libc.a
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libc.so b/ndk/platforms/android-3/arch-x86/lib/libc.so
deleted file mode 100755
index fb6851cd8..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libc.so
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libc_common.a b/ndk/platforms/android-3/arch-x86/lib/libc_common.a
deleted file mode 100644
index aed18c746..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libc_common.a
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libdl.so b/ndk/platforms/android-3/arch-x86/lib/libdl.so
deleted file mode 100755
index 3f2cbeb2a..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libdl.so
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libm.a b/ndk/platforms/android-3/arch-x86/lib/libm.a
deleted file mode 100644
index 4e7c1f960..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libm.a
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libm.so b/ndk/platforms/android-3/arch-x86/lib/libm.so
deleted file mode 100755
index 1f4649437..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libm.so
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libstdc++.a b/ndk/platforms/android-3/arch-x86/lib/libstdc++.a
deleted file mode 100644
index ff5c78ee9..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libstdc++.a
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libstdc++.so b/ndk/platforms/android-3/arch-x86/lib/libstdc++.so
deleted file mode 100755
index 79124d170..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libstdc++.so
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libthread_db.a b/ndk/platforms/android-3/arch-x86/lib/libthread_db.a
deleted file mode 100644
index abe0957cf..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libthread_db.a
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/lib/libthread_db.so b/ndk/platforms/android-3/arch-x86/lib/libthread_db.so
deleted file mode 100755
index 861427450..000000000
--- a/ndk/platforms/android-3/arch-x86/lib/libthread_db.so
+++ /dev/null
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/a.out.h b/ndk/platforms/android-9/arch-x86/include/asm/a.out.h
index 6aecff73b..6aecff73b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/a.out.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/a.out.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/acpi.h b/ndk/platforms/android-9/arch-x86/include/asm/acpi.h
index 0115ce9bd..0115ce9bd 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/acpi.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/acpi.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/acpi_32.h b/ndk/platforms/android-9/arch-x86/include/asm/acpi_32.h
index fe0043cb6..fe0043cb6 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/acpi_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/acpi_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/alternative.h b/ndk/platforms/android-9/arch-x86/include/asm/alternative.h
index 17c1dc5ed..17c1dc5ed 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/alternative.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/alternative.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/alternative_32.h b/ndk/platforms/android-9/arch-x86/include/asm/alternative_32.h
index ef1311134..ef1311134 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/alternative_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/alternative_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/apic.h b/ndk/platforms/android-9/arch-x86/include/asm/apic.h
index 5cb718197..5cb718197 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/apic.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/apic.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/apic_32.h b/ndk/platforms/android-9/arch-x86/include/asm/apic_32.h
index 02c9d9b3d..02c9d9b3d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/apic_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/apic_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/apicdef.h b/ndk/platforms/android-9/arch-x86/include/asm/apicdef.h
index bd19f5ae0..bd19f5ae0 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/apicdef.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/apicdef.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/apicdef_32.h b/ndk/platforms/android-9/arch-x86/include/asm/apicdef_32.h
index a4a5edb0c..a4a5edb0c 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/apicdef_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/apicdef_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/atomic.h b/ndk/platforms/android-9/arch-x86/include/asm/atomic.h
index 00289cf4a..00289cf4a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/atomic.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/atomic.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/atomic_32.h b/ndk/platforms/android-9/arch-x86/include/asm/atomic_32.h
index 677aac8ec..677aac8ec 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/atomic_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/atomic_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/auxvec.h b/ndk/platforms/android-9/arch-x86/include/asm/auxvec.h
index f065eb1bb..f065eb1bb 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/auxvec.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/auxvec.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/bitops.h b/ndk/platforms/android-9/arch-x86/include/asm/bitops.h
index 3b58565a1..3b58565a1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/bitops.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/bitops.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/bitops_32.h b/ndk/platforms/android-9/arch-x86/include/asm/bitops_32.h
index fa77fe298..fa77fe298 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/bitops_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/bitops_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/bug.h b/ndk/platforms/android-9/arch-x86/include/asm/bug.h
index 9247022b3..9247022b3 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/bug.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/bug.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/byteorder.h b/ndk/platforms/android-9/arch-x86/include/asm/byteorder.h
index a839798c8..a839798c8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/byteorder.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/byteorder.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cache.h b/ndk/platforms/android-9/arch-x86/include/asm/cache.h
index 2766a71ad..2766a71ad 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cache.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cache.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cacheflush.h b/ndk/platforms/android-9/arch-x86/include/asm/cacheflush.h
index 028277b5b..028277b5b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cacheflush.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cacheflush.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg.h b/ndk/platforms/android-9/arch-x86/include/asm/cmpxchg.h
index de059a2a6..de059a2a6 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cmpxchg.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg_32.h b/ndk/platforms/android-9/arch-x86/include/asm/cmpxchg_32.h
index 3632f4c80..3632f4c80 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cmpxchg_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cpufeature.h b/ndk/platforms/android-9/arch-x86/include/asm/cpufeature.h
index 47af45749..47af45749 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cpufeature.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cpufeature.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cpufeature_32.h b/ndk/platforms/android-9/arch-x86/include/asm/cpufeature_32.h
index a8ebc405e..a8ebc405e 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cpufeature_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cpufeature_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/cputime.h b/ndk/platforms/android-9/arch-x86/include/asm/cputime.h
index 0e79e0bae..0e79e0bae 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/cputime.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/cputime.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/current.h b/ndk/platforms/android-9/arch-x86/include/asm/current.h
index b53c6fecb..b53c6fecb 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/current.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/current.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/current_32.h b/ndk/platforms/android-9/arch-x86/include/asm/current_32.h
index f74b371c9..f74b371c9 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/current_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/current_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/delay.h b/ndk/platforms/android-9/arch-x86/include/asm/delay.h
index 7cb5f745d..7cb5f745d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/delay.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/delay.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/desc.h b/ndk/platforms/android-9/arch-x86/include/asm/desc.h
index e9d448b03..e9d448b03 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/desc.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/desc.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/desc_32.h b/ndk/platforms/android-9/arch-x86/include/asm/desc_32.h
index f53191c2a..f53191c2a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/desc_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/desc_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/desc_defs.h b/ndk/platforms/android-9/arch-x86/include/asm/desc_defs.h
index bf6de4ad3..bf6de4ad3 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/desc_defs.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/desc_defs.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/div64.h b/ndk/platforms/android-9/arch-x86/include/asm/div64.h
index 3fef43ebe..3fef43ebe 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/div64.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/div64.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping.h b/ndk/platforms/android-9/arch-x86/include/asm/dma-mapping.h
index 3da1da6e4..3da1da6e4 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dma-mapping.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping_32.h b/ndk/platforms/android-9/arch-x86/include/asm/dma-mapping_32.h
index 974a60b64..974a60b64 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dma-mapping_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dma.h b/ndk/platforms/android-9/arch-x86/include/asm/dma.h
index ae51e02e7..ae51e02e7 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dma.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dma.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dma_32.h b/ndk/platforms/android-9/arch-x86/include/asm/dma_32.h
index 9c24f5ef7..9c24f5ef7 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dma_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dma_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dwarf2.h b/ndk/platforms/android-9/arch-x86/include/asm/dwarf2.h
index c937591ae..c937591ae 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dwarf2.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dwarf2.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/dwarf2_32.h b/ndk/platforms/android-9/arch-x86/include/asm/dwarf2_32.h
index a2dc3f120..a2dc3f120 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/dwarf2_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/dwarf2_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/e820.h b/ndk/platforms/android-9/arch-x86/include/asm/e820.h
index 8a88ff013..8a88ff013 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/e820.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/e820.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/elf.h b/ndk/platforms/android-9/arch-x86/include/asm/elf.h
index 6c6fbbf85..6c6fbbf85 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/elf.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/elf.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/errno.h b/ndk/platforms/android-9/arch-x86/include/asm/errno.h
index e8f7425a8..e8f7425a8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/errno.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/errno.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/fcntl.h b/ndk/platforms/android-9/arch-x86/include/asm/fcntl.h
index 00630ade4..00630ade4 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/fcntl.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/fcntl.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/fixmap.h b/ndk/platforms/android-9/arch-x86/include/asm/fixmap.h
index 19b9cc86e..19b9cc86e 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/fixmap.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/fixmap.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/fixmap_32.h b/ndk/platforms/android-9/arch-x86/include/asm/fixmap_32.h
index 95de8a078..95de8a078 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/fixmap_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/fixmap_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/genapic.h b/ndk/platforms/android-9/arch-x86/include/asm/genapic.h
index 84e687e19..84e687e19 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/genapic.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/genapic.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/genapic_32.h b/ndk/platforms/android-9/arch-x86/include/asm/genapic_32.h
index 07801ea63..07801ea63 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/genapic_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/genapic_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/hardirq.h b/ndk/platforms/android-9/arch-x86/include/asm/hardirq.h
index ee224f18c..ee224f18c 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/hardirq.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/hardirq.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/hardirq_32.h b/ndk/platforms/android-9/arch-x86/include/asm/hardirq_32.h
index b682f662e..b682f662e 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/hardirq_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/hardirq_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/highmem.h b/ndk/platforms/android-9/arch-x86/include/asm/highmem.h
index f7388518b..f7388518b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/highmem.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/highmem.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/hw_irq.h b/ndk/platforms/android-9/arch-x86/include/asm/hw_irq.h
index ed937c7f7..ed937c7f7 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/hw_irq.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/hw_irq.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/hw_irq_32.h b/ndk/platforms/android-9/arch-x86/include/asm/hw_irq_32.h
index 6f584fc22..6f584fc22 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/hw_irq_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/hw_irq_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/i387.h b/ndk/platforms/android-9/arch-x86/include/asm/i387.h
index 269255799..269255799 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/i387.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/i387.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/i387_32.h b/ndk/platforms/android-9/arch-x86/include/asm/i387_32.h
index 8563fb904..8563fb904 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/i387_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/i387_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/i8253.h b/ndk/platforms/android-9/arch-x86/include/asm/i8253.h
index 93b1d1a3a..93b1d1a3a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/i8253.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/i8253.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/i8259.h b/ndk/platforms/android-9/arch-x86/include/asm/i8259.h
index c2366ea88..c2366ea88 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/i8259.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/i8259.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ia32_unistd.h b/ndk/platforms/android-9/arch-x86/include/asm/ia32_unistd.h
index 848d228d3..848d228d3 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ia32_unistd.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ia32_unistd.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/io.h b/ndk/platforms/android-9/arch-x86/include/asm/io.h
index ea52e66ea..ea52e66ea 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/io.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/io.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/io_32.h b/ndk/platforms/android-9/arch-x86/include/asm/io_32.h
index f7e0025a4..f7e0025a4 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/io_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/io_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/io_apic.h b/ndk/platforms/android-9/arch-x86/include/asm/io_apic.h
index ed608d309..ed608d309 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/io_apic.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/io_apic.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/io_apic_32.h b/ndk/platforms/android-9/arch-x86/include/asm/io_apic_32.h
index cc858a36b..cc858a36b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/io_apic_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/io_apic_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ioctl.h b/ndk/platforms/android-9/arch-x86/include/asm/ioctl.h
index 6e446b6f6..6e446b6f6 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ioctl.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ioctl.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ioctls.h b/ndk/platforms/android-9/arch-x86/include/asm/ioctls.h
index 3aedc0477..3aedc0477 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ioctls.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ioctls.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ipcbuf.h b/ndk/platforms/android-9/arch-x86/include/asm/ipcbuf.h
index 32342c190..32342c190 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ipcbuf.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/irq.h b/ndk/platforms/android-9/arch-x86/include/asm/irq.h
index 07a331de1..07a331de1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/irq.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/irq.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/irq_32.h b/ndk/platforms/android-9/arch-x86/include/asm/irq_32.h
index 31410713a..31410713a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/irq_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/irq_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/irqflags.h b/ndk/platforms/android-9/arch-x86/include/asm/irqflags.h
index 4f8466244..4f8466244 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/irqflags.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/irqflags.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/irqflags_32.h b/ndk/platforms/android-9/arch-x86/include/asm/irqflags_32.h
index 9002e44e3..9002e44e3 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/irqflags_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/irqflags_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ist.h b/ndk/platforms/android-9/arch-x86/include/asm/ist.h
index 0abab19bc..0abab19bc 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ist.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ist.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/kmap_types.h b/ndk/platforms/android-9/arch-x86/include/asm/kmap_types.h
index c2313eec1..c2313eec1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/kmap_types.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/kmap_types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ldt.h b/ndk/platforms/android-9/arch-x86/include/asm/ldt.h
index 19b91ab6a..19b91ab6a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ldt.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ldt.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/linkage.h b/ndk/platforms/android-9/arch-x86/include/asm/linkage.h
index f149e4db1..f149e4db1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/linkage.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/linkage.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/linkage_32.h b/ndk/platforms/android-9/arch-x86/include/asm/linkage_32.h
index 6db10ee96..6db10ee96 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/linkage_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/linkage_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/local.h b/ndk/platforms/android-9/arch-x86/include/asm/local.h
index 85080b86d..85080b86d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/local.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/local.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/local_32.h b/ndk/platforms/android-9/arch-x86/include/asm/local_32.h
index fcad7537a..fcad7537a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/local_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/local_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/math_emu.h b/ndk/platforms/android-9/arch-x86/include/asm/math_emu.h
index 9380d19a6..9380d19a6 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/math_emu.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/math_emu.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc.h b/ndk/platforms/android-9/arch-x86/include/asm/mc146818rtc.h
index 849787796..849787796 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mc146818rtc.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc_32.h b/ndk/platforms/android-9/arch-x86/include/asm/mc146818rtc_32.h
index 899d60804..899d60804 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mc146818rtc_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mman.h b/ndk/platforms/android-9/arch-x86/include/asm/mman.h
index 7eda3195a..7eda3195a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mman.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mman.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mmsegment.h b/ndk/platforms/android-9/arch-x86/include/asm/mmsegment.h
index 76045c7ab..76045c7ab 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mmsegment.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mmsegment.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mmu.h b/ndk/platforms/android-9/arch-x86/include/asm/mmu.h
index 30db10a49..30db10a49 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mmu.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mmu.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/module.h b/ndk/platforms/android-9/arch-x86/include/asm/module.h
index ff292d4ee..ff292d4ee 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/module.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/module.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/module_32.h b/ndk/platforms/android-9/arch-x86/include/asm/module_32.h
index 2e267299b..2e267299b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/module_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/module_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mpspec.h b/ndk/platforms/android-9/arch-x86/include/asm/mpspec.h
index 23365043f..23365043f 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mpspec.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mpspec.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mpspec_32.h b/ndk/platforms/android-9/arch-x86/include/asm/mpspec_32.h
index 7acbe8a78..7acbe8a78 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mpspec_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mpspec_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/mpspec_def.h b/ndk/platforms/android-9/arch-x86/include/asm/mpspec_def.h
index 1f15363c7..1f15363c7 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/mpspec_def.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/mpspec_def.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/msgbuf.h b/ndk/platforms/android-9/arch-x86/include/asm/msgbuf.h
index 8843e78ea..8843e78ea 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/msgbuf.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/msr-index.h b/ndk/platforms/android-9/arch-x86/include/asm/msr-index.h
index 8ea204ed8..8ea204ed8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/msr-index.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/msr-index.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/msr.h b/ndk/platforms/android-9/arch-x86/include/asm/msr.h
index f1da91779..f1da91779 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/msr.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/msr.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/page.h b/ndk/platforms/android-9/arch-x86/include/asm/page.h
index e6dcf2730..e6dcf2730 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/page.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/page.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/page_32.h b/ndk/platforms/android-9/arch-x86/include/asm/page_32.h
index 718cf955a..718cf955a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/page_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/page_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/param.h b/ndk/platforms/android-9/arch-x86/include/asm/param.h
index 3fafd551d..3fafd551d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/param.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/param.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/paravirt.h b/ndk/platforms/android-9/arch-x86/include/asm/paravirt.h
index ab0d08e17..ab0d08e17 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/paravirt.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/paravirt.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pda.h b/ndk/platforms/android-9/arch-x86/include/asm/pda.h
index 671122452..671122452 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pda.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pda.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/percpu.h b/ndk/platforms/android-9/arch-x86/include/asm/percpu.h
index 7740e67d4..7740e67d4 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/percpu.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/percpu.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/percpu_32.h b/ndk/platforms/android-9/arch-x86/include/asm/percpu_32.h
index 21135d6a6..21135d6a6 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/percpu_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/percpu_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgalloc.h b/ndk/platforms/android-9/arch-x86/include/asm/pgalloc.h
index d5a032b67..d5a032b67 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgalloc.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgalloc.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgalloc_32.h b/ndk/platforms/android-9/arch-x86/include/asm/pgalloc_32.h
index bc0f88482..bc0f88482 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgalloc_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgalloc_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level-defs.h b/ndk/platforms/android-9/arch-x86/include/asm/pgtable-2level-defs.h
index 9edc6c522..9edc6c522 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level-defs.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgtable-2level-defs.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level.h b/ndk/platforms/android-9/arch-x86/include/asm/pgtable-2level.h
index 7ade4ed46..7ade4ed46 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgtable-2level.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgtable.h b/ndk/platforms/android-9/arch-x86/include/asm/pgtable.h
index 797e47302..797e47302 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgtable.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgtable.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/pgtable_32.h b/ndk/platforms/android-9/arch-x86/include/asm/pgtable_32.h
index c63ba938b..c63ba938b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/pgtable_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/pgtable_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/poll.h b/ndk/platforms/android-9/arch-x86/include/asm/poll.h
index 5b16673b5..5b16673b5 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/poll.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/poll.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/posix_types.h b/ndk/platforms/android-9/arch-x86/include/asm/posix_types.h
index 79bb4903f..79bb4903f 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/posix_types.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/posix_types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/posix_types_32.h b/ndk/platforms/android-9/arch-x86/include/asm/posix_types_32.h
index 97a8b6919..97a8b6919 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/posix_types_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/posix_types_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/prctl.h b/ndk/platforms/android-9/arch-x86/include/asm/prctl.h
index 8852ca703..8852ca703 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/prctl.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/prctl.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/processor-flags.h b/ndk/platforms/android-9/arch-x86/include/asm/processor-flags.h
index 79e8f7d7d..79e8f7d7d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/processor-flags.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/processor-flags.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/processor.h b/ndk/platforms/android-9/arch-x86/include/asm/processor.h
index 7d4774961..7d4774961 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/processor.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/processor.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/processor_32.h b/ndk/platforms/android-9/arch-x86/include/asm/processor_32.h
index 539edd1a0..539edd1a0 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/processor_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/processor_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ptrace-abi.h b/ndk/platforms/android-9/arch-x86/include/asm/ptrace-abi.h
index 3e6ea082d..3e6ea082d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ptrace-abi.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ptrace-abi.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/ptrace.h b/ndk/platforms/android-9/arch-x86/include/asm/ptrace.h
index 4743e0fca..4743e0fca 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/ptrace.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/ptrace.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/required-features.h b/ndk/platforms/android-9/arch-x86/include/asm/required-features.h
index a96517a0a..a96517a0a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/required-features.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/required-features.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/resource.h b/ndk/platforms/android-9/arch-x86/include/asm/resource.h
index 29d9e12e8..29d9e12e8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/resource.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/resource.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/rwlock.h b/ndk/platforms/android-9/arch-x86/include/asm/rwlock.h
index 3693542bd..3693542bd 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/rwlock.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/rwlock.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/scatterlist.h b/ndk/platforms/android-9/arch-x86/include/asm/scatterlist.h
index fa4d0cc60..fa4d0cc60 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/scatterlist.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/scatterlist.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/scatterlist_32.h b/ndk/platforms/android-9/arch-x86/include/asm/scatterlist_32.h
index 29044c3e5..29044c3e5 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/scatterlist_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/scatterlist_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/sections.h b/ndk/platforms/android-9/arch-x86/include/asm/sections.h
index a21da3eb9..a21da3eb9 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/sections.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/sections.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/segment.h b/ndk/platforms/android-9/arch-x86/include/asm/segment.h
index 6877a80b2..6877a80b2 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/segment.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/segment.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/segment_32.h b/ndk/platforms/android-9/arch-x86/include/asm/segment_32.h
index 54b312bc2..54b312bc2 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/segment_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/segment_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/semaphore.h b/ndk/platforms/android-9/arch-x86/include/asm/semaphore.h
index 8b4c59572..8b4c59572 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/semaphore.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/semaphore.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/semaphore_32.h b/ndk/platforms/android-9/arch-x86/include/asm/semaphore_32.h
index babe77964..babe77964 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/semaphore_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/semaphore_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/sembuf.h b/ndk/platforms/android-9/arch-x86/include/asm/sembuf.h
index 1695208aa..1695208aa 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/sembuf.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/sembuf.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/setup.h b/ndk/platforms/android-9/arch-x86/include/asm/setup.h
index 696ed97e1..696ed97e1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/setup.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/setup.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/shmbuf.h b/ndk/platforms/android-9/arch-x86/include/asm/shmbuf.h
index 314ccb7d8..314ccb7d8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/shmbuf.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/shmparam.h b/ndk/platforms/android-9/arch-x86/include/asm/shmparam.h
index e667ba1c8..e667ba1c8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/shmparam.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/shmparam.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/sigcontext.h b/ndk/platforms/android-9/arch-x86/include/asm/sigcontext.h
index a8f76f0c1..a8f76f0c1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/sigcontext.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/siginfo.h b/ndk/platforms/android-9/arch-x86/include/asm/siginfo.h
index 0d21d227a..0d21d227a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/siginfo.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/siginfo.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/signal.h b/ndk/platforms/android-9/arch-x86/include/asm/signal.h
index 6d84eabbd..6d84eabbd 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/signal.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/signal.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/smp.h b/ndk/platforms/android-9/arch-x86/include/asm/smp.h
index 40d460133..40d460133 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/smp.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/smp.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/smp_32.h b/ndk/platforms/android-9/arch-x86/include/asm/smp_32.h
index f093a240d..f093a240d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/smp_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/smp_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/socket.h b/ndk/platforms/android-9/arch-x86/include/asm/socket.h
index 27d243f14..27d243f14 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/socket.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/socket.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/sockios.h b/ndk/platforms/android-9/arch-x86/include/asm/sockios.h
index ebdfa98f4..ebdfa98f4 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/sockios.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/sockios.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/spinlock.h b/ndk/platforms/android-9/arch-x86/include/asm/spinlock.h
index 10d123aa7..10d123aa7 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/spinlock.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/spinlock.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/spinlock_32.h b/ndk/platforms/android-9/arch-x86/include/asm/spinlock_32.h
index 171783e94..171783e94 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/spinlock_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/spinlock_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/spinlock_types.h b/ndk/platforms/android-9/arch-x86/include/asm/spinlock_types.h
index ab914c4e8..ab914c4e8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/spinlock_types.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/spinlock_types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/stat.h b/ndk/platforms/android-9/arch-x86/include/asm/stat.h
index 837d716fa..837d716fa 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/stat.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/stat.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/statfs.h b/ndk/platforms/android-9/arch-x86/include/asm/statfs.h
index 592d864c5..592d864c5 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/statfs.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/statfs.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/string.h b/ndk/platforms/android-9/arch-x86/include/asm/string.h
index 92fa29122..92fa29122 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/string.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/string.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/string_32.h b/ndk/platforms/android-9/arch-x86/include/asm/string_32.h
index 58a72d77f..58a72d77f 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/string_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/string_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/swiotlb.h b/ndk/platforms/android-9/arch-x86/include/asm/swiotlb.h
index 5ee37b3aa..5ee37b3aa 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/swiotlb.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/swiotlb.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/system.h b/ndk/platforms/android-9/arch-x86/include/asm/system.h
index 834193b3b..834193b3b 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/system.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/system.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/system_32.h b/ndk/platforms/android-9/arch-x86/include/asm/system_32.h
index d799ae648..d799ae648 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/system_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/system_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/termbits.h b/ndk/platforms/android-9/arch-x86/include/asm/termbits.h
index 6d7c5e8c1..6d7c5e8c1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/termbits.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/termbits.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/termios.h b/ndk/platforms/android-9/arch-x86/include/asm/termios.h
index 01bdca404..6542c781a 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/termios.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/termios.h
@@ -53,15 +53,15 @@ struct termio {
 #define N_PPP 3
 #define N_STRIP 4
 #define N_AX25 5
-#define N_X25 6
+#define N_X25 6  
 #define N_6PACK 7
-#define N_MASC 8
-#define N_R3964 9
-#define N_PROFIBUS_FDL 10
-#define N_IRDA 11
-#define N_SMSBLOCK 12
-#define N_HDLC 13
+#define N_MASC 8  
+#define N_R3964 9  
+#define N_PROFIBUS_FDL 10  
+#define N_IRDA 11  
+#define N_SMSBLOCK 12  
+#define N_HDLC 13  
 #define N_SYNC_PPP 14
-#define N_HCI 15
+#define N_HCI 15  
 
 #endif
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/thread_info.h b/ndk/platforms/android-9/arch-x86/include/asm/thread_info.h
index ff46b08a8..ff46b08a8 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/thread_info.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/thread_info.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/thread_info_32.h b/ndk/platforms/android-9/arch-x86/include/asm/thread_info_32.h
index 5664ef80f..5664ef80f 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/thread_info_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/thread_info_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/tlbflush.h b/ndk/platforms/android-9/arch-x86/include/asm/tlbflush.h
index fd6b22630..fd6b22630 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/tlbflush.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/tlbflush.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/tlbflush_32.h b/ndk/platforms/android-9/arch-x86/include/asm/tlbflush_32.h
index 8ebff80ca..8ebff80ca 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/tlbflush_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/tlbflush_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/tsc.h b/ndk/platforms/android-9/arch-x86/include/asm/tsc.h
index 2528cd172..2528cd172 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/tsc.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/tsc.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/types.h b/ndk/platforms/android-9/arch-x86/include/asm/types.h
index 4af92b0cd..4af92b0cd 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/types.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/uaccess.h b/ndk/platforms/android-9/arch-x86/include/asm/uaccess.h
index b2bec6995..b2bec6995 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/uaccess.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/uaccess.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/uaccess_32.h b/ndk/platforms/android-9/arch-x86/include/asm/uaccess_32.h
index 9827fc434..9827fc434 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/uaccess_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/uaccess_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/unaligned.h b/ndk/platforms/android-9/arch-x86/include/asm/unaligned.h
index ce7a8a772..ce7a8a772 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/unaligned.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/unaligned.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/unistd.h b/ndk/platforms/android-9/arch-x86/include/asm/unistd.h
index 769f83618..769f83618 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/unistd.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/unistd.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/unistd_32.h b/ndk/platforms/android-9/arch-x86/include/asm/unistd_32.h
index b3d8b19b5..b3d8b19b5 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/unistd_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/unistd_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/user.h b/ndk/platforms/android-9/arch-x86/include/asm/user.h
index 980b0aaad..980b0aaad 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/user.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/user.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/user32.h b/ndk/platforms/android-9/arch-x86/include/asm/user32.h
index 89eabb183..89eabb183 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/user32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/user32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/user_32.h b/ndk/platforms/android-9/arch-x86/include/asm/user_32.h
index 8e0296c97..8e0296c97 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/user_32.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/user_32.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/vm86.h b/ndk/platforms/android-9/arch-x86/include/asm/vm86.h
index d0e71f13c..d0e71f13c 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/vm86.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/vm86.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/voyager.h b/ndk/platforms/android-9/arch-x86/include/asm/voyager.h
index c6f50a98d..c6f50a98d 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/voyager.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/voyager.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/vsyscall.h b/ndk/platforms/android-9/arch-x86/include/asm/vsyscall.h
index a7bee3b63..a7bee3b63 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/vsyscall.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/vsyscall.h
diff --git a/ndk/platforms/android-3/arch-x86/include/asm/xen/hypercall.h b/ndk/platforms/android-9/arch-x86/include/asm/xen/hypercall.h
index 3c523a8c1..3c523a8c1 100644
--- a/ndk/platforms/android-3/arch-x86/include/asm/xen/hypercall.h
+++ b/ndk/platforms/android-9/arch-x86/include/asm/xen/hypercall.h
diff --git a/ndk/platforms/android-3/arch-x86/include/endian.h b/ndk/platforms/android-9/arch-x86/include/endian.h
index ad37919f3..4a705364e 100644
--- a/ndk/platforms/android-3/arch-x86/include/endian.h
+++ b/ndk/platforms/android-9/arch-x86/include/endian.h
@@ -31,14 +31,14 @@
 
 #if defined(_KERNEL) && !defined(I386_CPU)
 #define	__swap32md(x) ({						\
-	u_int32_t __swap32md_x = (x);					\
+	uint32_t __swap32md_x = (x);					\
 									\
 	__asm ("bswap %1" : "+r" (__swap32md_x));			\
 	__swap32md_x;							\
 })
 #else
 #define	__swap32md(x) ({						\
-	u_int32_t __swap32md_x = (x);					\
+	uint32_t __swap32md_x = (x);					\
 									\
 	__asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" :		\
 	    "+r" (__swap32md_x));					\
@@ -47,13 +47,13 @@
 #endif	/* _KERNEL && !I386_CPU */
 
 #define	__swap64md(x) ({						\
-	u_int64_t __swap64md_x = (x);					\
+	uint64_t __swap64md_x = (x);					\
 									\
-	(u_int64_t)__swap32md(__swap64md_x >> 32) |			\
-	    (u_int64_t)__swap32md(__swap64md_x & 0xffffffff) << 32;	\
+	(uint64_t)__swap32md(__swap64md_x >> 32) |			\
+	    (uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32;	\
 })
 #define	__swap16md(x) ({						\
-	u_int16_t __swap16md_x = (x);					\
+	uint16_t __swap16md_x = (x);					\
 									\
 	__asm ("rorw $8, %w1" : "+r" (__swap16md_x));			\
 	__swap16md_x;							\
diff --git a/ndk/platforms/android-3/arch-x86/include/fenv.h b/ndk/platforms/android-9/arch-x86/include/fenv.h
index b124366ac..5fe64e2d8 100644
--- a/ndk/platforms/android-3/arch-x86/include/fenv.h
+++ b/ndk/platforms/android-9/arch-x86/include/fenv.h
@@ -102,7 +102,7 @@ extern const fenv_t	__fe_dfl_env;
 #define	__fnclex()		__asm __volatile("fnclex")
 #define	__fnstenv(__env)	__asm __volatile("fnstenv %0" : "=m" (*(__env)))
 #define	__fnstcw(__cw)		__asm __volatile("fnstcw %0" : "=m" (*(__cw)))
-#define	__fnstsw(__sw)		__asm __volatile("fnstsw %0" : "=am" (*(__sw)))
+#define	__fnstsw(__sw)		__asm __volatile("fnstsw %0" : "=a" (*(__sw)))
 #define	__fwait()		__asm __volatile("fwait")
 #define	__ldmxcsr(__csr)	__asm __volatile("ldmxcsr %0" : : "m" (__csr))
 #define	__stmxcsr(__csr)	__asm __volatile("stmxcsr %0" : "=m" (*(__csr)))
@@ -131,7 +131,8 @@ feclearexcept(int __excepts)
 static __inline int
 fegetexceptflag(fexcept_t *__flagp, int __excepts)
 {
-	int __mxcsr, __status;
+	int __mxcsr;
+	short __status;
 
 	__fnstsw(&__status);
 	if (__HAS_SSE())
@@ -148,7 +149,8 @@ int feraiseexcept(int __excepts);
 static __inline int
 fetestexcept(int __excepts)
 {
-	int __mxcsr, __status;
+	int __mxcsr;
+	short __status;
 
 	__fnstsw(&__status);
 	if (__HAS_SSE())
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
index e9280a5da..e9280a5da 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/_types.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/asm.h b/ndk/platforms/android-9/arch-x86/include/machine/asm.h
index 7a23060a9..7a23060a9 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/asm.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/asm.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/cdefs.h b/ndk/platforms/android-9/arch-x86/include/machine/cdefs.h
index 6efee6ac4..6efee6ac4 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/cdefs.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/cdefs.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/exec.h b/ndk/platforms/android-9/arch-x86/include/machine/exec.h
index d09174191..d09174191 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/exec.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/exec.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/ieee.h b/ndk/platforms/android-9/arch-x86/include/machine/ieee.h
index 55b370327..55b370327 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/ieee.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/ieee.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/internal_types.h b/ndk/platforms/android-9/arch-x86/include/machine/internal_types.h
index 4d1833cf8..4d1833cf8 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/internal_types.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/internal_types.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/kernel.h b/ndk/platforms/android-9/arch-x86/include/machine/kernel.h
index 19d157728..19d157728 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/kernel.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/kernel.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/limits.h b/ndk/platforms/android-9/arch-x86/include/machine/limits.h
index 86fd85482..86fd85482 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/limits.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/limits.h
diff --git a/ndk/platforms/android-3/arch-x86/include/machine/setjmp.h b/ndk/platforms/android-9/arch-x86/include/machine/setjmp.h
index ded095da9..ded095da9 100644
--- a/ndk/platforms/android-3/arch-x86/include/machine/setjmp.h
+++ b/ndk/platforms/android-9/arch-x86/include/machine/setjmp.h
diff --git a/ndk/platforms/android-9/arch-x86/include/sys/atomics.h b/ndk/platforms/android-9/arch-x86/include/sys/atomics.h
new file mode 100644
index 000000000..7aed3ae0b
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/include/sys/atomics.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _SYS_ATOMICS_H
+#define _SYS_ATOMICS_H
+
+#include <sys/cdefs.h>
+#include <sys/time.h>
+
+__BEGIN_DECLS
+
+static inline __attribute__((always_inline)) int
+__atomic_cmpxchg(int old, int _new, volatile int *ptr)
+{
+  return !__sync_bool_compare_and_swap (ptr, old, _new);
+}
+
+static inline __attribute__((always_inline)) int
+__atomic_swap(int _new, volatile int *ptr)
+{
+  return __sync_lock_test_and_set(ptr, _new);
+}
+
+static inline __attribute__((always_inline)) int
+__atomic_dec(volatile int *ptr)
+{
+  return __sync_fetch_and_sub (ptr, 1);
+}
+
+static inline __attribute__((always_inline)) int
+__atomic_inc(volatile int *ptr)
+{
+  return __sync_fetch_and_add (ptr, 1);
+}
+
+int __futex_wait(volatile void *ftx, int val, const struct timespec *timeout);
+int __futex_wake(volatile void *ftx, int count);
+
+__END_DECLS
+
+#endif /* _SYS_ATOMICS_H */
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o
new file mode 100644
index 000000000..102fc37bd
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o
new file mode 100644
index 000000000..662d85aad
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_so.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o b/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o
new file mode 100644
index 000000000..102fc37bd
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/crtbegin_static.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtend_android.o b/ndk/platforms/android-9/arch-x86/lib/crtend_android.o
new file mode 100644
index 000000000..87716a04c
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/crtend_android.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/crtend_so.o b/ndk/platforms/android-9/arch-x86/lib/crtend_so.o
new file mode 100644
index 000000000..4c4460fbe
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/crtend_so.o
diff --git a/ndk/platforms/android-9/arch-x86/lib/libEGL.so b/ndk/platforms/android-9/arch-x86/lib/libEGL.so
new file mode 100755
index 000000000..6a8277ed0
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libEGL.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so b/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so
new file mode 100755
index 000000000..d03d357f4
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libGLESv1_CM.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so b/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so
new file mode 100755
index 000000000..51d6b5954
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libGLESv2.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so b/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so
new file mode 100755
index 000000000..110da004e
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libOpenSLES.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libandroid.so b/ndk/platforms/android-9/arch-x86/lib/libandroid.so
new file mode 100755
index 000000000..e1064369a
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libandroid.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libc.a b/ndk/platforms/android-9/arch-x86/lib/libc.a
new file mode 100644
index 000000000..e47736fad
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libc.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libc.so b/ndk/platforms/android-9/arch-x86/lib/libc.so
index ce06b7c45..bf23ca564 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libc.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libc.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libdl.so b/ndk/platforms/android-9/arch-x86/lib/libdl.so
new file mode 100755
index 000000000..2c1318748
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libdl.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so b/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so
new file mode 100755
index 000000000..c66995710
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libjnigraphics.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/liblog.so b/ndk/platforms/android-9/arch-x86/lib/liblog.so
new file mode 100755
index 000000000..f28bf77b6
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/liblog.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libm.a b/ndk/platforms/android-9/arch-x86/lib/libm.a
new file mode 100644
index 000000000..092b2cce4
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libm.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libm.so b/ndk/platforms/android-9/arch-x86/lib/libm.so
new file mode 100755
index 000000000..ce9ffea70
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libm.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libstdc++.a b/ndk/platforms/android-9/arch-x86/lib/libstdc++.a
new file mode 100644
index 000000000..04788e0ce
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libstdc++.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libstdc++.so b/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
index 37426600a..4ddac651a 100755
--- a/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
+++ b/ndk/platforms/android-9/arch-x86/lib/libstdc++.so
diff --git a/ndk/platforms/android-9/arch-x86/lib/libthread_db.a b/ndk/platforms/android-9/arch-x86/lib/libthread_db.a
new file mode 100644
index 000000000..de2e34db6
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libthread_db.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libz.a b/ndk/platforms/android-9/arch-x86/lib/libz.a
new file mode 100644
index 000000000..1df2ec38d
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libz.a
diff --git a/ndk/platforms/android-9/arch-x86/lib/libz.so b/ndk/platforms/android-9/arch-x86/lib/libz.so
new file mode 100755
index 000000000..9155cb992
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/lib/libz.so
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt
new file mode 100644
index 000000000..88d4105ae
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libEGL.so.txt
@@ -0,0 +1,44 @@
+eglBindAPI
+eglBindTexImage
+eglChooseConfig
+eglClientWaitSyncKHR
+eglCopyBuffers
+eglCreateContext
+eglCreateImageKHR
+eglCreatePbufferFromClientBuffer
+eglCreatePbufferSurface
+eglCreatePixmapSurface
+eglCreateSyncKHR
+eglCreateWindowSurface
+eglDestroyContext
+eglDestroyImageKHR
+eglDestroySurface
+eglDestroySyncKHR
+eglGetConfigAttrib
+eglGetConfigs
+eglGetCurrentContext
+eglGetCurrentDisplay
+eglGetCurrentSurface
+eglGetDisplay
+eglGetError
+eglGetProcAddress
+eglInitialize
+eglLockSurfaceKHR
+eglMakeCurrent
+eglQueryAPI
+eglQueryContext
+eglQueryString
+eglQuerySurface
+eglReleaseTexImage
+eglReleaseThread
+eglSetSwapRectangleANDROID
+eglSurfaceAttrib
+eglSwapBuffers
+eglSwapInterval
+eglTerminate
+eglUnlockSurfaceKHR
+eglWaitClient
+eglWaitGL
+eglWaitNative
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libGLESv1_CM.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libGLESv1_CM.so.txt
new file mode 100644
index 000000000..7c53cfadc
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libGLESv1_CM.so.txt
@@ -0,0 +1,280 @@
+glActiveTexture
+glAlphaFunc
+glAlphaFuncx
+glAlphaFuncxOES
+glBindBuffer
+glBindFramebufferOES
+glBindRenderbufferOES
+glBindTexture
+glBindVertexArrayOES
+glBlendEquationOES
+glBlendEquationSeparateOES
+glBlendFunc
+glBlendFuncSeparateOES
+glBufferData
+glBufferSubData
+glCheckFramebufferStatusOES
+glClear
+glClearColor
+glClearColorx
+glClearColorxOES
+glClearDepthf
+glClearDepthfOES
+glClearDepthx
+glClearDepthxOES
+glClearStencil
+glClientActiveTexture
+glClipPlanef
+glClipPlanefIMG
+glClipPlanefOES
+glClipPlanex
+glClipPlanexIMG
+glClipPlanexOES
+glColor4f
+glColor4ub
+glColor4x
+glColor4xOES
+glColorMask
+glColorPointer
+glColorPointerBounds
+glCompressedTexImage2D
+glCompressedTexSubImage2D
+glCopyTexImage2D
+glCopyTexSubImage2D
+glCullFace
+glCurrentPaletteMatrixOES
+glDeleteBuffers
+glDeleteFencesNV
+glDeleteFramebuffersOES
+glDeleteRenderbuffersOES
+glDeleteTextures
+glDeleteVertexArraysOES
+glDepthFunc
+glDepthMask
+glDepthRangef
+glDepthRangefOES
+glDepthRangex
+glDepthRangexOES
+glDisable
+glDisableClientState
+glDisableDriverControlQCOM
+glDiscardFramebufferEXT
+glDrawArrays
+glDrawElements
+glDrawTexfOES
+glDrawTexfvOES
+glDrawTexiOES
+glDrawTexivOES
+glDrawTexsOES
+glDrawTexsvOES
+glDrawTexxOES
+glDrawTexxvOES
+glEGLImageTargetRenderbufferStorageOES
+glEGLImageTargetTexture2DOES
+glEnable
+glEnableClientState
+glEnableDriverControlQCOM
+glEndTilingQCOM
+glExtGetBufferPointervQCOM
+glExtGetBuffersQCOM
+glExtGetFramebuffersQCOM
+glExtGetProgramBinarySourceQCOM
+glExtGetProgramsQCOM
+glExtGetRenderbuffersQCOM
+glExtGetShadersQCOM
+glExtGetTexLevelParameterivQCOM
+glExtGetTexSubImageQCOM
+glExtGetTexturesQCOM
+glExtIsProgramBinaryQCOM
+glExtTexObjectStateOverrideiQCOM
+glFinish
+glFinishFenceNV
+glFlush
+glFogf
+glFogfv
+glFogx
+glFogxOES
+glFogxv
+glFogxvOES
+glFramebufferRenderbufferOES
+glFramebufferTexture2DMultisampleIMG
+glFramebufferTexture2DOES
+glFrontFace
+glFrustumf
+glFrustumfOES
+glFrustumx
+glFrustumxOES
+glGenBuffers
+glGenFencesNV
+glGenFramebuffersOES
+glGenRenderbuffersOES
+glGenTextures
+glGenVertexArraysOES
+glGenerateMipmapOES
+glGetBooleanv
+glGetBufferParameteriv
+glGetBufferPointervOES
+glGetClipPlanef
+glGetClipPlanefOES
+glGetClipPlanex
+glGetClipPlanexOES
+glGetDriverControlStringQCOM
+glGetDriverControlsQCOM
+glGetError
+glGetFenceivNV
+glGetFixedv
+glGetFixedvOES
+glGetFloatv
+glGetFramebufferAttachmentParameterivOES
+glGetIntegerv
+glGetLightfv
+glGetLightxv
+glGetLightxvOES
+glGetMaterialfv
+glGetMaterialxv
+glGetMaterialxvOES
+glGetPointerv
+glGetRenderbufferParameterivOES
+glGetString
+glGetTexEnvfv
+glGetTexEnviv
+glGetTexEnvxv
+glGetTexEnvxvOES
+glGetTexGenfvOES
+glGetTexGenivOES
+glGetTexGenxvOES
+glGetTexParameterfv
+glGetTexParameteriv
+glGetTexParameterxv
+glGetTexParameterxvOES
+glHint
+glIsBuffer
+glIsEnabled
+glIsFenceNV
+glIsFramebufferOES
+glIsRenderbufferOES
+glIsTexture
+glIsVertexArrayOES
+glLightModelf
+glLightModelfv
+glLightModelx
+glLightModelxOES
+glLightModelxv
+glLightModelxvOES
+glLightf
+glLightfv
+glLightx
+glLightxOES
+glLightxv
+glLightxvOES
+glLineWidth
+glLineWidthx
+glLineWidthxOES
+glLoadIdentity
+glLoadMatrixf
+glLoadMatrixx
+glLoadMatrixxOES
+glLoadPaletteFromModelViewMatrixOES
+glLogicOp
+glMapBufferOES
+glMaterialf
+glMaterialfv
+glMaterialx
+glMaterialxOES
+glMaterialxv
+glMaterialxvOES
+glMatrixIndexPointerOES
+glMatrixIndexPointerOESBounds
+glMatrixMode
+glMultMatrixf
+glMultMatrixx
+glMultMatrixxOES
+glMultiDrawArraysEXT
+glMultiDrawElementsEXT
+glMultiTexCoord4f
+glMultiTexCoord4x
+glMultiTexCoord4xOES
+glNormal3f
+glNormal3x
+glNormal3xOES
+glNormalPointer
+glNormalPointerBounds
+glOrthof
+glOrthofOES
+glOrthox
+glOrthoxOES
+glPixelStorei
+glPointParameterf
+glPointParameterfv
+glPointParameterx
+glPointParameterxOES
+glPointParameterxv
+glPointParameterxvOES
+glPointSize
+glPointSizePointerOES
+glPointSizePointerOESBounds
+glPointSizex
+glPointSizexOES
+glPolygonOffset
+glPolygonOffsetx
+glPolygonOffsetxOES
+glPopMatrix
+glPushMatrix
+glQueryMatrixxOES
+glReadPixels
+glRenderbufferStorageMultisampleIMG
+glRenderbufferStorageOES
+glRotatef
+glRotatex
+glRotatexOES
+glSampleCoverage
+glSampleCoveragex
+glSampleCoveragexOES
+glScalef
+glScalex
+glScalexOES
+glScissor
+glSetFenceNV
+glShadeModel
+glStartTilingQCOM
+glStencilFunc
+glStencilMask
+glStencilOp
+glTestFenceNV
+glTexCoordPointer
+glTexCoordPointerBounds
+glTexEnvf
+glTexEnvfv
+glTexEnvi
+glTexEnviv
+glTexEnvx
+glTexEnvxOES
+glTexEnvxv
+glTexEnvxvOES
+glTexGenfOES
+glTexGenfvOES
+glTexGeniOES
+glTexGenivOES
+glTexGenxOES
+glTexGenxvOES
+glTexImage2D
+glTexParameterf
+glTexParameterfv
+glTexParameteri
+glTexParameteriv
+glTexParameterx
+glTexParameterxOES
+glTexParameterxv
+glTexParameterxvOES
+glTexSubImage2D
+glTranslatef
+glTranslatex
+glTranslatexOES
+glUnmapBufferOES
+glVertexPointer
+glVertexPointerBounds
+glViewport
+glWeightPointerOES
+glWeightPointerOESBounds
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libGLESv2.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libGLESv2.so.txt
new file mode 100644
index 000000000..d86b82cfd
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libGLESv2.so.txt
@@ -0,0 +1,204 @@
+glActiveTexture
+glAttachShader
+glBeginPerfMonitorAMD
+glBindAttribLocation
+glBindBuffer
+glBindFramebuffer
+glBindRenderbuffer
+glBindTexture
+glBindVertexArrayOES
+glBlendColor
+glBlendEquation
+glBlendEquationSeparate
+glBlendFunc
+glBlendFuncSeparate
+glBufferData
+glBufferSubData
+glCheckFramebufferStatus
+glClear
+glClearColor
+glClearDepthf
+glClearStencil
+glColorMask
+glCompileShader
+glCompressedTexImage2D
+glCompressedTexImage3DOES
+glCompressedTexSubImage2D
+glCompressedTexSubImage3DOES
+glCopyTexImage2D
+glCopyTexSubImage2D
+glCopyTexSubImage3DOES
+glCoverageMaskNV
+glCoverageOperationNV
+glCreateProgram
+glCreateShader
+glCullFace
+glDeleteBuffers
+glDeleteFencesNV
+glDeleteFramebuffers
+glDeletePerfMonitorsAMD
+glDeleteProgram
+glDeleteRenderbuffers
+glDeleteShader
+glDeleteTextures
+glDeleteVertexArraysOES
+glDepthFunc
+glDepthMask
+glDepthRangef
+glDetachShader
+glDisable
+glDisableDriverControlQCOM
+glDisableVertexAttribArray
+glDiscardFramebufferEXT
+glDrawArrays
+glDrawElements
+glEGLImageTargetRenderbufferStorageOES
+glEGLImageTargetTexture2DOES
+glEnable
+glEnableDriverControlQCOM
+glEnableVertexAttribArray
+glEndPerfMonitorAMD
+glEndTilingQCOM
+glExtGetBufferPointervQCOM
+glExtGetBuffersQCOM
+glExtGetFramebuffersQCOM
+glExtGetProgramBinarySourceQCOM
+glExtGetProgramsQCOM
+glExtGetRenderbuffersQCOM
+glExtGetShadersQCOM
+glExtGetTexLevelParameterivQCOM
+glExtGetTexSubImageQCOM
+glExtGetTexturesQCOM
+glExtIsProgramBinaryQCOM
+glExtTexObjectStateOverrideiQCOM
+glFinish
+glFinishFenceNV
+glFlush
+glFramebufferRenderbuffer
+glFramebufferTexture2D
+glFramebufferTexture2DMultisampleIMG
+glFramebufferTexture3DOES
+glFrontFace
+glGenBuffers
+glGenFencesNV
+glGenFramebuffers
+glGenPerfMonitorsAMD
+glGenRenderbuffers
+glGenTextures
+glGenVertexArraysOES
+glGenerateMipmap
+glGetActiveAttrib
+glGetActiveUniform
+glGetAttachedShaders
+glGetAttribLocation
+glGetBooleanv
+glGetBufferParameteriv
+glGetBufferPointervOES
+glGetDriverControlStringQCOM
+glGetDriverControlsQCOM
+glGetError
+glGetFenceivNV
+glGetFloatv
+glGetFramebufferAttachmentParameteriv
+glGetIntegerv
+glGetPerfMonitorCounterDataAMD
+glGetPerfMonitorCounterInfoAMD
+glGetPerfMonitorCounterStringAMD
+glGetPerfMonitorCountersAMD
+glGetPerfMonitorGroupStringAMD
+glGetPerfMonitorGroupsAMD
+glGetProgramBinaryOES
+glGetProgramInfoLog
+glGetProgramiv
+glGetRenderbufferParameteriv
+glGetShaderInfoLog
+glGetShaderPrecisionFormat
+glGetShaderSource
+glGetShaderiv
+glGetString
+glGetTexParameterfv
+glGetTexParameteriv
+glGetUniformLocation
+glGetUniformfv
+glGetUniformiv
+glGetVertexAttribPointerv
+glGetVertexAttribfv
+glGetVertexAttribiv
+glHint
+glIsBuffer
+glIsEnabled
+glIsFenceNV
+glIsFramebuffer
+glIsProgram
+glIsRenderbuffer
+glIsShader
+glIsTexture
+glIsVertexArrayOES
+glLineWidth
+glLinkProgram
+glMapBufferOES
+glMultiDrawArraysEXT
+glMultiDrawElementsEXT
+glPixelStorei
+glPolygonOffset
+glProgramBinaryOES
+glReadPixels
+glReleaseShaderCompiler
+glRenderbufferStorage
+glRenderbufferStorageMultisampleIMG
+glSampleCoverage
+glScissor
+glSelectPerfMonitorCountersAMD
+glSetFenceNV
+glShaderBinary
+glShaderSource
+glStartTilingQCOM
+glStencilFunc
+glStencilFuncSeparate
+glStencilMask
+glStencilMaskSeparate
+glStencilOp
+glStencilOpSeparate
+glTestFenceNV
+glTexImage2D
+glTexImage3DOES
+glTexParameterf
+glTexParameterfv
+glTexParameteri
+glTexParameteriv
+glTexSubImage2D
+glTexSubImage3DOES
+glUniform1f
+glUniform1fv
+glUniform1i
+glUniform1iv
+glUniform2f
+glUniform2fv
+glUniform2i
+glUniform2iv
+glUniform3f
+glUniform3fv
+glUniform3i
+glUniform3iv
+glUniform4f
+glUniform4fv
+glUniform4i
+glUniform4iv
+glUniformMatrix2fv
+glUniformMatrix3fv
+glUniformMatrix4fv
+glUnmapBufferOES
+glUseProgram
+glValidateProgram
+glVertexAttrib1f
+glVertexAttrib1fv
+glVertexAttrib2f
+glVertexAttrib2fv
+glVertexAttrib3f
+glVertexAttrib3fv
+glVertexAttrib4f
+glVertexAttrib4fv
+glVertexAttribPointer
+glViewport
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libOpenSLES.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libOpenSLES.so.txt
new file mode 100644
index 000000000..b42d1ee12
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libOpenSLES.so.txt
@@ -0,0 +1,52 @@
+slCreateEngine
+slQueryNumSupportedEngineInterfaces
+slQuerySupportedEngineInterfaces
+SL_IID_3DCOMMIT
+SL_IID_3DDOPPLER
+SL_IID_3DGROUPING
+SL_IID_3DLOCATION
+SL_IID_3DMACROSCOPIC
+SL_IID_3DSOURCE
+SL_IID_ANDROIDCONFIGURATION
+SL_IID_ANDROIDEFFECT
+SL_IID_ANDROIDEFFECTCAPABILITIES
+SL_IID_ANDROIDEFFECTSEND
+SL_IID_ANDROIDSIMPLEBUFFERQUEUE
+SL_IID_AUDIODECODERCAPABILITIES
+SL_IID_AUDIOENCODER
+SL_IID_AUDIOENCODERCAPABILITIES
+SL_IID_AUDIOIODEVICECAPABILITIES
+SL_IID_BASSBOOST
+SL_IID_BUFFERQUEUE
+SL_IID_DEVICEVOLUME
+SL_IID_DYNAMICINTERFACEMANAGEMENT
+SL_IID_DYNAMICSOURCE
+SL_IID_EFFECTSEND
+SL_IID_ENGINE
+SL_IID_ENGINECAPABILITIES
+SL_IID_ENVIRONMENTALREVERB
+SL_IID_EQUALIZER
+SL_IID_LED
+SL_IID_METADATAEXTRACTION
+SL_IID_METADATATRAVERSAL
+SL_IID_MIDIMESSAGE
+SL_IID_MIDIMUTESOLO
+SL_IID_MIDITEMPO
+SL_IID_MIDITIME
+SL_IID_MUTESOLO
+SL_IID_NULL
+SL_IID_OBJECT
+SL_IID_OUTPUTMIX
+SL_IID_PITCH
+SL_IID_PLAY
+SL_IID_PLAYBACKRATE
+SL_IID_PREFETCHSTATUS
+SL_IID_PRESETREVERB
+SL_IID_RATEPITCH
+SL_IID_RECORD
+SL_IID_SEEK
+SL_IID_THREADSYNC
+SL_IID_VIBRA
+SL_IID_VIRTUALIZER
+SL_IID_VISUALIZATION
+SL_IID_VOLUME
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libandroid.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libandroid.so.txt
new file mode 100644
index 000000000..80178a320
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libandroid.so.txt
@@ -0,0 +1,150 @@
+AAssetDir_close
+AAssetDir_getNextFileName
+AAssetDir_rewind
+AAssetManager_fromJava
+AAssetManager_open
+AAssetManager_openDir
+AAsset_close
+AAsset_getBuffer
+AAsset_getLength
+AAsset_getRemainingLength
+AAsset_isAllocated
+AAsset_openFileDescriptor
+AAsset_read
+AAsset_seek
+AConfiguration_copy
+AConfiguration_delete
+AConfiguration_diff
+AConfiguration_fromAssetManager
+AConfiguration_getCountry
+AConfiguration_getDensity
+AConfiguration_getKeyboard
+AConfiguration_getKeysHidden
+AConfiguration_getLanguage
+AConfiguration_getMcc
+AConfiguration_getMnc
+AConfiguration_getNavHidden
+AConfiguration_getNavigation
+AConfiguration_getOrientation
+AConfiguration_getScreenLong
+AConfiguration_getScreenSize
+AConfiguration_getSdkVersion
+AConfiguration_getTouchscreen
+AConfiguration_getUiModeNight
+AConfiguration_getUiModeType
+AConfiguration_isBetterThan
+AConfiguration_match
+AConfiguration_new
+AConfiguration_setCountry
+AConfiguration_setDensity
+AConfiguration_setKeyboard
+AConfiguration_setKeysHidden
+AConfiguration_setLanguage
+AConfiguration_setMcc
+AConfiguration_setMnc
+AConfiguration_setNavHidden
+AConfiguration_setNavigation
+AConfiguration_setOrientation
+AConfiguration_setScreenLong
+AConfiguration_setScreenSize
+AConfiguration_setSdkVersion
+AConfiguration_setTouchscreen
+AConfiguration_setUiModeNight
+AConfiguration_setUiModeType
+AInputEvent_getDeviceId
+AInputEvent_getSource
+AInputEvent_getType
+AInputQueue_attachLooper
+AInputQueue_detachLooper
+AInputQueue_finishEvent
+AInputQueue_getEvent
+AInputQueue_hasEvents
+AInputQueue_preDispatchEvent
+AKeyEvent_getAction
+AKeyEvent_getDownTime
+AKeyEvent_getEventTime
+AKeyEvent_getFlags
+AKeyEvent_getKeyCode
+AKeyEvent_getMetaState
+AKeyEvent_getRepeatCount
+AKeyEvent_getScanCode
+ALooper_acquire
+ALooper_addFd
+ALooper_forThread
+ALooper_pollAll
+ALooper_pollOnce
+ALooper_prepare
+ALooper_release
+ALooper_removeFd
+ALooper_wake
+AMotionEvent_getAction
+AMotionEvent_getDownTime
+AMotionEvent_getEdgeFlags
+AMotionEvent_getEventTime
+AMotionEvent_getFlags
+AMotionEvent_getHistoricalEventTime
+AMotionEvent_getHistoricalPressure
+AMotionEvent_getHistoricalSize
+AMotionEvent_getHistoricalX
+AMotionEvent_getHistoricalY
+AMotionEvent_getHistorySize
+AMotionEvent_getMetaState
+AMotionEvent_getOrientation
+AMotionEvent_getPointerCount
+AMotionEvent_getPointerId
+AMotionEvent_getPressure
+AMotionEvent_getRawX
+AMotionEvent_getRawY
+AMotionEvent_getSize
+AMotionEvent_getToolMajor
+AMotionEvent_getToolMinor
+AMotionEvent_getTouchMajor
+AMotionEvent_getTouchMinor
+AMotionEvent_getX
+AMotionEvent_getXOffset
+AMotionEvent_getXPrecision
+AMotionEvent_getY
+AMotionEvent_getYOffset
+AMotionEvent_getYPrecision
+ANativeActivity_finish
+ANativeActivity_hideSoftInput
+ANativeActivity_setWindowFlags
+ANativeActivity_setWindowFormat
+ANativeActivity_showSoftInput
+ANativeWindow_acquire
+ANativeWindow_fromSurface
+ANativeWindow_getFormat
+ANativeWindow_getHeight
+ANativeWindow_getWidth
+ANativeWindow_lock
+ANativeWindow_release
+ANativeWindow_setBuffersGeometry
+ANativeWindow_unlockAndPost
+AObbInfo_delete
+AObbInfo_getFlags
+AObbInfo_getPackageName
+AObbInfo_getVersion
+AObbScanner_getObbInfo
+ASensorEventQueue_disableSensor
+ASensorEventQueue_enableSensor
+ASensorEventQueue_getEvents
+ASensorEventQueue_hasEvents
+ASensorEventQueue_setEventRate
+ASensorManager_createEventQueue
+ASensorManager_destroyEventQueue
+ASensorManager_getDefaultSensor
+ASensorManager_getInstance
+ASensorManager_getSensorList
+ASensor_getMinDelay
+ASensor_getName
+ASensor_getResolution
+ASensor_getType
+ASensor_getVendor
+AStorageManager_delete
+AStorageManager_getMountedObbPath
+AStorageManager_isObbMounted
+AStorageManager_mountObb
+AStorageManager_new
+AStorageManager_unmountObb
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt
new file mode 100644
index 000000000..39d905ef7
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libc.so.txt
@@ -0,0 +1,992 @@
+MD5_Final
+MD5_Init
+MD5_Update
+SHA1Final
+SHA1Init
+SHA1Transform
+SHA1Update
+__arc4_getbyte
+__assert
+__assert2
+__atexit_register_cleanup
+__b64_ntop
+__b64_pton
+__bionic_atfork_run_child
+__bionic_atfork_run_parent
+__bionic_atfork_run_prepare
+__brk
+__cxa_atexit
+__cxa_finalize
+__divdi3
+__dn_comp
+__dn_count_labels
+__dn_skipname
+__dorand48
+__errno
+__evAddTime
+__evCmpTime
+__evConsIovec
+__evConsTime
+__evNowTime
+__evSubTime
+__evTimeSpec
+__evTimeVal
+__evUTCTime
+__fcntl
+__fcntl64
+__findenv
+__fork
+__fp_nquery
+__fp_query
+__fstatfs64
+__futex_syscall3
+__futex_syscall4
+__futex_wait
+__futex_wait_ex
+__futex_wake
+__futex_wake_ex
+__get_h_errno
+__get_res_cache
+__get_sp
+__get_stack_base
+__get_thread
+__get_tls
+__getcpu
+__getcwd
+__getpriority
+__hostalias
+__init_tls
+__ioctl
+__libc_android_log_assert
+__libc_android_log_print
+__libc_android_log_vprint
+__libc_fini
+__libc_init
+__libc_init_common
+__libc_preinit
+__llseek
+__loc_aton
+__loc_ntoa
+__mmap2
+__moddi3
+__ns_format_ttl
+__ns_get16
+__ns_get32
+__ns_initparse
+__ns_makecanon
+__ns_msg_getflag
+__ns_name_compress
+__ns_name_ntol
+__ns_name_ntop
+__ns_name_pack
+__ns_name_pton
+__ns_name_rollback
+__ns_name_skip
+__ns_name_uncompress
+__ns_name_unpack
+__ns_parserr
+__ns_put16
+__ns_put32
+__ns_samename
+__ns_skiprr
+__ns_sprintrr
+__ns_sprintrrf
+__open
+__openat
+__p_cdname
+__p_cdnname
+__p_class
+__p_fqname
+__p_fqnname
+__p_option
+__p_query
+__p_rcode
+__p_secstodate
+__p_section
+__p_sockun
+__p_time
+__p_type
+__popcountsi2
+__pthread_cleanup_pop
+__pthread_cleanup_push
+__pthread_clone
+__pthread_cond_timedwait
+__pthread_cond_timedwait_relative
+__ptrace
+__putlong
+__putshort
+__reboot
+__res_close
+__res_dnok
+__res_get_nibblesuffix
+__res_get_nibblesuffix2
+__res_get_state
+__res_get_static
+__res_getservers
+__res_hnok
+__res_hostalias
+__res_isourserver
+__res_mailok
+__res_nameinquery
+__res_nametoclass
+__res_nametotype
+__res_nclose
+__res_ndestroy
+__res_ninit
+__res_nmkquery
+__res_nopt
+__res_nquery
+__res_nquerydomain
+__res_nsearch
+__res_nsend
+__res_opt
+__res_ownok
+__res_pquery
+__res_put_state
+__res_queriesmatch
+__res_querydomain
+__res_randomid
+__res_send
+__res_send_setqhook
+__res_send_setrhook
+__res_setservers
+__res_vinit
+__rt_sigaction
+__rt_sigprocmask
+__rt_sigtimedwait
+__sched_cpualloc
+__sched_cpucount
+__sched_cpufree
+__sched_getaffinity
+__sclose
+__set_errno
+__set_thread_area
+__set_tls
+__setresuid
+__setreuid
+__setuid
+__sflags
+__sflush
+__sfp
+__sigsuspend
+__sinit
+__smakebuf
+__sread
+__srefill
+__srget
+__sseek
+__stack_chk_fail
+__statfs64
+__swbuf
+__swhatbuf
+__swrite
+__swsetup
+__sym_ntop
+__sym_ntos
+__sym_ston
+__sys_clone
+__syslog
+__system_properties_init
+__system_property_find
+__system_property_find_nth
+__system_property_get
+__system_property_read
+__system_property_wait
+__thread_entry
+__timer_create
+__timer_delete
+__timer_getoverrun
+__timer_gettime
+__timer_settime
+__udivdi3
+__umoddi3
+__wait4
+__waitid
+_cleanup
+_exit
+_exit_thread
+_exit_with_stack_teardown
+_fwalk
+_getlong
+_getshort
+_init_thread
+_longjmp
+_setjmp
+_thread_created_hook
+_waitpid
+abort
+accept
+access
+acct
+alarm
+alphasort
+arc4random
+arc4random_addrandom
+arc4random_buf
+arc4random_stir
+arc4random_uniform
+asctime
+asctime64
+asctime64_r
+asctime_r
+asprintf
+atexit
+atoi
+atol
+atoll
+basename
+basename_r
+bcopy
+bind
+bindresvport
+brk
+bsd_signal
+bsearch
+btowc
+bzero
+calloc
+capget
+capset
+chdir
+chmod
+chown
+chroot
+clearenv
+clearerr
+clock
+clock_getres
+clock_gettime
+clock_nanosleep
+clock_settime
+close
+closedir
+closelog
+closelog_r
+connect
+cpuacct_add
+creat
+ctime
+ctime64
+ctime64_r
+ctime_r
+daemon
+delete_module
+difftime
+dirfd
+dirname
+dirname_r
+div
+dlcalloc
+dlfree
+dlindependent_calloc
+dlindependent_comalloc
+dlmallinfo
+dlmalloc
+dlmalloc_footprint
+dlmalloc_max_footprint
+dlmalloc_stats
+dlmalloc_trim
+dlmalloc_usable_size
+dlmalloc_walk_free_pages
+dlmalloc_walk_heap
+dlmallopt
+dlmemalign
+dlpvalloc
+dlrealloc
+dlvalloc
+dn_expand
+drand48
+dup
+dup2
+endpwent
+endservent
+endusershell
+endutent
+epoll_create
+epoll_ctl
+epoll_wait
+erand48
+err
+errx
+ether_aton
+ether_aton_r
+ether_ntoa
+ether_ntoa_r
+eventfd
+eventfd_read
+eventfd_write
+execl
+execle
+execlp
+execv
+execve
+execvp
+exit
+fchdir
+fchmod
+fchmodat
+fchown
+fchownat
+fclose
+fcntl
+fdatasync
+fdopen
+fdopendir
+fdprintf
+feof
+ferror
+fflush
+fgetc
+fgetln
+fgetpos
+fgets
+fgetwc
+fgetws
+fileno
+flock
+flockfile
+fnmatch
+fopen
+fork
+fpathconf
+fprintf
+fpurge
+fputc
+fputs
+fputwc
+fputws
+fread
+free
+freeaddrinfo
+freedtoa
+freopen
+fscanf
+fseek
+fseeko
+fsetpos
+fstat
+fstatat
+fstatfs
+fsync
+ftell
+ftello
+ftime
+ftok
+ftruncate
+ftruncate64
+ftrylockfile
+fts_children
+fts_close
+fts_open
+fts_read
+fts_set
+funlockfile
+funopen
+futex
+fwide
+fwprintf
+fwrite
+fwscanf
+gai_strerror
+get_malloc_leak_info
+getaddrinfo
+getc
+getc_unlocked
+getchar
+getchar_unlocked
+getcwd
+getdents
+getdtablesize
+getegid
+getenv
+geteuid
+getgid
+getgrgid
+getgrnam
+getgrouplist
+getgroups
+gethostbyaddr
+gethostbyname
+gethostbyname2
+gethostbyname_r
+gethostent
+gethostname
+getitimer
+getlogin
+getmntent
+getnameinfo
+getnetbyaddr
+getnetbyname
+getopt
+getopt_long
+getopt_long_only
+getpeername
+getpgid
+getpgrp
+getpid
+getppid
+getpriority
+getprotobyname
+getprotobynumber
+getpt
+getpwnam
+getpwuid
+getresgid
+getresuid
+getrlimit
+getrusage
+gets
+getservbyname
+getservbyport
+getservent
+getservent_r
+getsockname
+getsockopt
+gettid
+gettimeofday
+getuid
+getusershell
+getutent
+getwc
+getwchar
+gmtime
+gmtime64
+gmtime64_r
+gmtime_r
+herror
+hstrerror
+if_indextoname
+if_nametoindex
+index
+inet_addr
+inet_aton
+inet_nsap_addr
+inet_nsap_ntoa
+inet_ntoa
+inet_ntop
+inet_pton
+init_module
+initgroups
+inotify_add_watch
+inotify_init
+inotify_rm_watch
+ioctl
+ioprio_get
+ioprio_set
+isalnum
+isalpha
+isascii
+isatty
+isblank
+iscntrl
+isdigit
+isgraph
+islower
+isprint
+ispunct
+issetugid
+isspace
+isupper
+iswalnum
+iswalpha
+iswcntrl
+iswctype
+iswdigit
+iswgraph
+iswlower
+iswprint
+iswpunct
+iswspace
+iswupper
+iswxdigit
+isxdigit
+jrand48
+kill
+killpg
+klogctl
+lchown
+ldexp
+ldiv
+link
+listen
+lldiv
+localtime
+localtime64
+localtime64_r
+localtime_r
+longjmp
+longjmperror
+lrand48
+lseek
+lseek64
+lstat
+madvise
+mallinfo
+malloc
+malloc_debug_init
+mbrlen
+mbrtowc
+mbsinit
+mbsrtowcs
+mbstowcs
+memalign
+memccpy
+memchr
+memcmp
+memcpy
+memmem
+memmove
+memrchr
+memset
+memswap
+mincore
+mkdir
+mkdirat
+mkdtemp
+mknod
+mkstemp
+mkstemps
+mktemp
+mktime
+mktime64
+mlock
+mmap
+mount
+mprotect
+mrand48
+mremap
+msync
+munlock
+munmap
+nanosleep
+nice
+nrand48
+nsdispatch
+open
+openat
+opendir
+openlog
+openlog_r
+pathconf
+pause
+pclose
+perror
+pipe
+pipe2
+poll
+popen
+posix2time
+prctl
+pread
+pread64
+printf
+pselect
+pthread_atfork
+pthread_attr_destroy
+pthread_attr_getdetachstate
+pthread_attr_getguardsize
+pthread_attr_getschedparam
+pthread_attr_getschedpolicy
+pthread_attr_getscope
+pthread_attr_getstack
+pthread_attr_getstackaddr
+pthread_attr_getstacksize
+pthread_attr_init
+pthread_attr_setdetachstate
+pthread_attr_setguardsize
+pthread_attr_setschedparam
+pthread_attr_setschedpolicy
+pthread_attr_setscope
+pthread_attr_setstack
+pthread_attr_setstackaddr
+pthread_attr_setstacksize
+pthread_cond_broadcast
+pthread_cond_destroy
+pthread_cond_init
+pthread_cond_signal
+pthread_cond_timedwait
+pthread_cond_timedwait_monotonic
+pthread_cond_timedwait_monotonic_np
+pthread_cond_timedwait_relative_np
+pthread_cond_timeout_np
+pthread_cond_wait
+pthread_condattr_destroy
+pthread_condattr_getpshared
+pthread_condattr_init
+pthread_condattr_setpshared
+pthread_create
+pthread_detach
+pthread_equal
+pthread_exit
+pthread_getattr_np
+pthread_getcpuclockid
+pthread_getschedparam
+pthread_getspecific
+pthread_join
+pthread_key_create
+pthread_key_delete
+pthread_kill
+pthread_mutex_destroy
+pthread_mutex_init
+pthread_mutex_lock
+pthread_mutex_lock_timeout_np
+pthread_mutex_trylock
+pthread_mutex_unlock
+pthread_mutexattr_destroy
+pthread_mutexattr_getpshared
+pthread_mutexattr_gettype
+pthread_mutexattr_init
+pthread_mutexattr_setpshared
+pthread_mutexattr_settype
+pthread_once
+pthread_rwlock_destroy
+pthread_rwlock_init
+pthread_rwlock_rdlock
+pthread_rwlock_timedrdlock
+pthread_rwlock_timedwrlock
+pthread_rwlock_tryrdlock
+pthread_rwlock_trywrlock
+pthread_rwlock_unlock
+pthread_rwlock_wrlock
+pthread_rwlockattr_destroy
+pthread_rwlockattr_getpshared
+pthread_rwlockattr_init
+pthread_rwlockattr_setpshared
+pthread_self
+pthread_setname_np
+pthread_setschedparam
+pthread_setspecific
+pthread_sigmask
+ptrace
+ptsname
+ptsname_r
+putc
+putc_unlocked
+putchar
+putchar_unlocked
+putenv
+puts
+pututline
+putw
+putwc
+putwchar
+pwrite
+pwrite64
+qsort
+raise
+read
+readdir
+readdir_r
+readlink
+readv
+realloc
+realpath
+reboot
+recv
+recvfrom
+recvmsg
+regcomp
+regerror
+regexec
+regfree
+remove
+rename
+renameat
+res_init
+res_mkquery
+res_query
+res_search
+rewind
+rewinddir
+rmdir
+sbrk
+scandir
+scanf
+sched_get_priority_max
+sched_get_priority_min
+sched_getaffinity
+sched_getcpu
+sched_getparam
+sched_getscheduler
+sched_rr_get_interval
+sched_setaffinity
+sched_setparam
+sched_setscheduler
+sched_yield
+seed48
+select
+sem_close
+sem_destroy
+sem_getvalue
+sem_init
+sem_open
+sem_post
+sem_timedwait
+sem_trywait
+sem_unlink
+sem_wait
+send
+sendfile
+sendmsg
+sendto
+setbuf
+setbuffer
+setegid
+setenv
+seteuid
+setgid
+setgroups
+setitimer
+setjmp
+setlinebuf
+setlocale
+setlogmask
+setlogmask_r
+setpgid
+setpgrp
+setpriority
+setregid
+setresgid
+setresuid
+setreuid
+setrlimit
+setservent
+setsid
+setsockopt
+settimeofday
+setuid
+setusershell
+setutent
+setvbuf
+shutdown
+sigaction
+sigaltstack
+sigblock
+siginterrupt
+siglongjmp
+sigpending
+sigprocmask
+sigsetjmp
+sigsetmask
+sigsuspend
+sigwait
+sleep
+snprintf
+socket
+socketpair
+sprintf
+srand48
+sscanf
+stat
+statfs
+strcasecmp
+strcasestr
+strcat
+strchr
+strcmp
+strcoll
+strcpy
+strcspn
+strdup
+strerror
+strerror_r
+strftime
+strftime_tz
+strlcat
+strlcpy
+strlen
+strncasecmp
+strncat
+strncmp
+strncpy
+strndup
+strnlen
+strntoimax
+strntoumax
+strpbrk
+strptime
+strrchr
+strsep
+strsignal
+strspn
+strstr
+strtod
+strtoimax
+strtok
+strtok_r
+strtol
+strtoll
+strtotimeval
+strtoul
+strtoull
+strtoumax
+strxfrm
+swprintf
+swscanf
+symlink
+sync
+syscall
+sysconf
+sysinfo
+syslog
+syslog_r
+system
+sysv_signal
+tcgetpgrp
+tcsetpgrp
+tempnam
+time
+time2posix
+timegm
+timegm64
+timelocal
+timelocal64
+timer_create
+timer_delete
+timer_getoverrun
+timer_gettime
+timer_settime
+times
+tkill
+tmpfile
+tmpnam
+toascii
+tolower
+toupper
+towlower
+towupper
+truncate
+ttyname
+ttyname_r
+tzset
+umask
+umount
+umount2
+uname
+ungetc
+ungetwc
+unlink
+unlinkat
+unlockpt
+unsetenv
+usleep
+utime
+utimes
+utmpname
+valloc
+vasprintf
+verr
+verrx
+vfdprintf
+vfork
+vfprintf
+vfscanf
+vfwprintf
+vprintf
+vscanf
+vsnprintf
+vsprintf
+vsscanf
+vswprintf
+vsyslog
+vsyslog_r
+vwarn
+vwarnx
+vwprintf
+wait
+wait3
+waitid
+waitpid
+warn
+warnx
+wcpcpy
+wcpncpy
+wcrtomb
+wcscasecmp
+wcscat
+wcschr
+wcscmp
+wcscoll
+wcscpy
+wcscspn
+wcsdup
+wcsftime
+wcslcat
+wcslcpy
+wcslen
+wcsncasecmp
+wcsncat
+wcsncmp
+wcsncpy
+wcsnlen
+wcspbrk
+wcsrchr
+wcsrtombs
+wcsspn
+wcsstr
+wcstod
+wcstok
+wcstol
+wcstombs
+wcstoul
+wcswcs
+wcswidth
+wcsxfrm
+wctob
+wctype
+wcwidth
+wmemchr
+wmemcmp
+wmemcpy
+wmemmove
+wmemset
+wprintf
+write
+writev
+wscanf
+_C_ctype_
+_C_tolower_
+_C_toupper_
+__FINI_ARRAY__
+__INIT_ARRAY__
+__atexit
+__atexit_invalid
+__bionic_brk
+__evOptMonoTime
+__isthreaded
+__libc_malloc_default_dispatch
+__libc_malloc_dispatch
+__p_cert_syms
+__p_class_syms
+__p_key_syms
+__p_rcode_syms
+__p_type_syms
+__page_shift
+__page_size
+__popcount_tab
+__progname
+__rand48_add
+__rand48_mult
+__rand48_seed
+__sF
+__sdidinit
+__sglue
+__stack_chk_guard
+__system_property_area__
+_ctype_
+_ns_flagdata
+_tolower_tab_
+_toupper_tab_
+daylight
+environ
+h_errlist
+h_nerr
+optarg
+opterr
+optind
+optopt
+optreset
+sys_siglist
+sys_signame
+timezone
+tzname
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libdl.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libdl.so.txt
new file mode 100644
index 000000000..24de29a94
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libdl.so.txt
@@ -0,0 +1,8 @@
+dl_iterate_phdr
+dladdr
+dlclose
+dlerror
+dlopen
+dlsym
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libjnigraphics.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libjnigraphics.so.txt
new file mode 100644
index 000000000..9cbc8c2a9
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libjnigraphics.so.txt
@@ -0,0 +1,5 @@
+AndroidBitmap_getInfo
+AndroidBitmap_lockPixels
+AndroidBitmap_unlockPixels
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/liblog.so.txt b/ndk/platforms/android-9/arch-x86/symbols/liblog.so.txt
new file mode 100644
index 000000000..1405a819d
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/liblog.so.txt
@@ -0,0 +1,10 @@
+__android_log_assert
+__android_log_btwrite
+__android_log_buf_print
+__android_log_buf_write
+__android_log_bwrite
+__android_log_dev_available
+__android_log_print
+__android_log_vprint
+__android_log_write
+
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt
new file mode 100644
index 000000000..1552b5d69
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libm.so.txt
@@ -0,0 +1,194 @@
+__exp__D
+__fedisableexcept
+__feenableexcept
+__fpclassifyd
+__fpclassifyf
+__fpclassifyl
+__ieee754_rem_pio2
+__ieee754_rem_pio2f
+__isfinite
+__isfinitef
+__isfinitel
+__isinf
+__isinff
+__isinfl
+__isnanl
+__isnormal
+__isnormalf
+__isnormall
+__kernel_cos
+__kernel_cosdf
+__kernel_rem_pio2
+__kernel_sin
+__kernel_sindf
+__kernel_tan
+__kernel_tandf
+__log__D
+__signbit
+__signbitf
+__signbitl
+__test_sse
+_scan_nan
+acos
+acosf
+acosh
+acoshf
+asin
+asinf
+asinh
+asinhf
+atan
+atan2
+atan2f
+atanf
+atanh
+atanhf
+cbrt
+cbrtf
+ceil
+ceilf
+ceill
+copysign
+copysignf
+copysignl
+cos
+cosf
+cosh
+coshf
+drem
+dremf
+erf
+erfc
+erfcf
+erff
+exp
+exp2
+exp2f
+expf
+expm1
+expm1f
+fabs
+fabsf
+fabsl
+fdim
+fdimf
+fdiml
+fegetenv
+feholdexcept
+feraiseexcept
+fesetexceptflag
+feupdateenv
+finite
+finitef
+floor
+floorf
+floorl
+fma
+fmaf
+fmax
+fmaxf
+fmaxl
+fmin
+fminf
+fminl
+fmod
+fmodf
+frexp
+frexpf
+gamma
+gamma_r
+gammaf
+gammaf_r
+hypot
+hypotf
+ilogb
+ilogbf
+ilogbl
+isnan
+isnanf
+j0
+j0f
+j1
+j1f
+jn
+jnf
+ldexpf
+ldexpl
+lgamma
+lgamma_r
+lgammaf
+lgammaf_r
+llrint
+llrintf
+llround
+llroundf
+llroundl
+log
+log10
+log10f
+log1p
+log1pf
+logb
+logbf
+logf
+lrint
+lrintf
+lround
+lroundf
+lroundl
+modf
+modff
+nan
+nanf
+nearbyint
+nearbyintf
+nextafter
+nextafterf
+nexttowardf
+pow
+powf
+remainder
+remainderf
+remquo
+remquof
+rint
+rintf
+round
+roundf
+roundl
+scalb
+scalbf
+scalbn
+scalbnf
+scalbnl
+significand
+significandf
+sin
+sincos
+sincosf
+sincosl
+sinf
+sinh
+sinhf
+sqrt
+sqrtf
+tan
+tanf
+tanh
+tanhf
+tgamma
+tgammaf
+trunc
+truncf
+truncl
+y0
+y0f
+y1
+y1f
+yn
+ynf
+__FINI_ARRAY__
+__INIT_ARRAY__
+__fe_dfl_env
+__has_sse
+signgam
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libstdc++.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libstdc++.so.txt
new file mode 100644
index 000000000..920262d0d
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libstdc++.so.txt
@@ -0,0 +1,26 @@
+_ZN9type_infoC1ERKS_
+_ZN9type_infoC1Ev
+_ZN9type_infoC2ERKS_
+_ZN9type_infoC2Ev
+_ZN9type_infoD0Ev
+_ZN9type_infoD1Ev
+_ZN9type_infoD2Ev
+_ZNK9type_info4nameEv
+_ZNK9type_info6beforeERKS_
+_ZNK9type_infoeqERKS_
+_ZNK9type_infoneERKS_
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znaj
+_ZnajRKSt9nothrow_t
+_Znwj
+_ZnwjRKSt9nothrow_t
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
+_ZSt7nothrow
+__FINI_ARRAY__
+__INIT_ARRAY__
diff --git a/ndk/platforms/android-9/arch-x86/symbols/libz.so.txt b/ndk/platforms/android-9/arch-x86/symbols/libz.so.txt
new file mode 100644
index 000000000..e35c7afb4
--- /dev/null
+++ b/ndk/platforms/android-9/arch-x86/symbols/libz.so.txt
@@ -0,0 +1,76 @@
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePrime
+deflateReset
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+uncompress
+zError
+zlibCompileFlags
+zlibVersion
+__FINI_ARRAY__
+__INIT_ARRAY__
+deflate_copyright
+inflate_copyright
+z_errmsg