am d2454506: Merge "Move files to proper location in development/ndk/platforms"

* commit 'd24545065acbacc7e9f1482f08013a4046640ad7':
  Move files to proper location in development/ndk/platforms

183 files changed, 2 insertions, 5 deletions

diff --git a/ndk/platforms/android-5/arch-x86/include/asm/a.out.h b/ndk/platforms/android-3/arch-x86/include/asm/a.out.h
index 6aecff73b..6aecff73b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/a.out.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/a.out.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/acpi.h b/ndk/platforms/android-3/arch-x86/include/asm/acpi.h
index 0115ce9bd..0115ce9bd 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/acpi.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/acpi.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/acpi_32.h b/ndk/platforms/android-3/arch-x86/include/asm/acpi_32.h
index fe0043cb6..fe0043cb6 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/acpi_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/acpi_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/alternative.h b/ndk/platforms/android-3/arch-x86/include/asm/alternative.h
index 17c1dc5ed..17c1dc5ed 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/alternative.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/alternative.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/alternative_32.h b/ndk/platforms/android-3/arch-x86/include/asm/alternative_32.h
index ef1311134..ef1311134 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/alternative_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/alternative_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/apic.h b/ndk/platforms/android-3/arch-x86/include/asm/apic.h
index 5cb718197..5cb718197 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/apic.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/apic.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/apic_32.h b/ndk/platforms/android-3/arch-x86/include/asm/apic_32.h
index 02c9d9b3d..02c9d9b3d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/apic_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/apic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/apicdef.h b/ndk/platforms/android-3/arch-x86/include/asm/apicdef.h
index bd19f5ae0..bd19f5ae0 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/apicdef.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/apicdef.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/apicdef_32.h b/ndk/platforms/android-3/arch-x86/include/asm/apicdef_32.h
index a4a5edb0c..a4a5edb0c 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/apicdef_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/apicdef_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/atomic.h b/ndk/platforms/android-3/arch-x86/include/asm/atomic.h
index 00289cf4a..00289cf4a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/atomic.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/atomic.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/atomic_32.h b/ndk/platforms/android-3/arch-x86/include/asm/atomic_32.h
index 677aac8ec..677aac8ec 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/atomic_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/atomic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/auxvec.h b/ndk/platforms/android-3/arch-x86/include/asm/auxvec.h
index f065eb1bb..f065eb1bb 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/auxvec.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/auxvec.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/bitops.h b/ndk/platforms/android-3/arch-x86/include/asm/bitops.h
index 3b58565a1..3b58565a1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/bitops.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/bitops.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/bitops_32.h b/ndk/platforms/android-3/arch-x86/include/asm/bitops_32.h
index fa77fe298..fa77fe298 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/bitops_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/bitops_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/bug.h b/ndk/platforms/android-3/arch-x86/include/asm/bug.h
index 9247022b3..9247022b3 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/bug.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/bug.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/byteorder.h b/ndk/platforms/android-3/arch-x86/include/asm/byteorder.h
index a839798c8..a839798c8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/byteorder.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/byteorder.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cache.h b/ndk/platforms/android-3/arch-x86/include/asm/cache.h
index 2766a71ad..2766a71ad 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cache.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cache.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cacheflush.h b/ndk/platforms/android-3/arch-x86/include/asm/cacheflush.h
index 028277b5b..028277b5b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cacheflush.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cacheflush.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg.h b/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg.h
index de059a2a6..de059a2a6 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg_32.h b/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg_32.h
index 3632f4c80..3632f4c80 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cmpxchg_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cpufeature.h b/ndk/platforms/android-3/arch-x86/include/asm/cpufeature.h
index 47af45749..47af45749 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cpufeature.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cpufeature.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cpufeature_32.h b/ndk/platforms/android-3/arch-x86/include/asm/cpufeature_32.h
index a8ebc405e..a8ebc405e 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cpufeature_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cpufeature_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/cputime.h b/ndk/platforms/android-3/arch-x86/include/asm/cputime.h
index 0e79e0bae..0e79e0bae 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/cputime.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/cputime.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/current.h b/ndk/platforms/android-3/arch-x86/include/asm/current.h
index b53c6fecb..b53c6fecb 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/current.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/current.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/current_32.h b/ndk/platforms/android-3/arch-x86/include/asm/current_32.h
index f74b371c9..f74b371c9 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/current_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/current_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/delay.h b/ndk/platforms/android-3/arch-x86/include/asm/delay.h
index 7cb5f745d..7cb5f745d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/delay.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/delay.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/desc.h b/ndk/platforms/android-3/arch-x86/include/asm/desc.h
index e9d448b03..e9d448b03 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/desc.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/desc.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/desc_32.h b/ndk/platforms/android-3/arch-x86/include/asm/desc_32.h
index f53191c2a..f53191c2a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/desc_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/desc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/desc_defs.h b/ndk/platforms/android-3/arch-x86/include/asm/desc_defs.h
index bf6de4ad3..bf6de4ad3 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/desc_defs.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/desc_defs.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/div64.h b/ndk/platforms/android-3/arch-x86/include/asm/div64.h
index 3fef43ebe..3fef43ebe 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/div64.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/div64.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping.h b/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping.h
index 3da1da6e4..3da1da6e4 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping_32.h b/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping_32.h
index 974a60b64..974a60b64 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dma-mapping_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dma.h b/ndk/platforms/android-3/arch-x86/include/asm/dma.h
index ae51e02e7..ae51e02e7 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dma.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dma.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dma_32.h b/ndk/platforms/android-3/arch-x86/include/asm/dma_32.h
index 9c24f5ef7..9c24f5ef7 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dma_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dma_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dwarf2.h b/ndk/platforms/android-3/arch-x86/include/asm/dwarf2.h
index c937591ae..c937591ae 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dwarf2.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dwarf2.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/dwarf2_32.h b/ndk/platforms/android-3/arch-x86/include/asm/dwarf2_32.h
index a2dc3f120..a2dc3f120 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/dwarf2_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/dwarf2_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/e820.h b/ndk/platforms/android-3/arch-x86/include/asm/e820.h
index 8a88ff013..8a88ff013 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/e820.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/e820.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/elf.h b/ndk/platforms/android-3/arch-x86/include/asm/elf.h
index 6c6fbbf85..6c6fbbf85 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/elf.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/elf.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/errno.h b/ndk/platforms/android-3/arch-x86/include/asm/errno.h
index e8f7425a8..e8f7425a8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/errno.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/errno.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/fcntl.h b/ndk/platforms/android-3/arch-x86/include/asm/fcntl.h
index 00630ade4..00630ade4 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/fcntl.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/fcntl.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/fixmap.h b/ndk/platforms/android-3/arch-x86/include/asm/fixmap.h
index 19b9cc86e..19b9cc86e 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/fixmap.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/fixmap.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/fixmap_32.h b/ndk/platforms/android-3/arch-x86/include/asm/fixmap_32.h
index 95de8a078..95de8a078 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/fixmap_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/fixmap_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/genapic.h b/ndk/platforms/android-3/arch-x86/include/asm/genapic.h
index 84e687e19..84e687e19 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/genapic.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/genapic.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/genapic_32.h b/ndk/platforms/android-3/arch-x86/include/asm/genapic_32.h
index 07801ea63..07801ea63 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/genapic_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/genapic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/hardirq.h b/ndk/platforms/android-3/arch-x86/include/asm/hardirq.h
index ee224f18c..ee224f18c 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/hardirq.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/hardirq.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/hardirq_32.h b/ndk/platforms/android-3/arch-x86/include/asm/hardirq_32.h
index b682f662e..b682f662e 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/hardirq_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/hardirq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/highmem.h b/ndk/platforms/android-3/arch-x86/include/asm/highmem.h
index f7388518b..f7388518b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/highmem.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/highmem.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/hw_irq.h b/ndk/platforms/android-3/arch-x86/include/asm/hw_irq.h
index ed937c7f7..ed937c7f7 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/hw_irq.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/hw_irq.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/hw_irq_32.h b/ndk/platforms/android-3/arch-x86/include/asm/hw_irq_32.h
index 6f584fc22..6f584fc22 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/hw_irq_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/hw_irq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/i387.h b/ndk/platforms/android-3/arch-x86/include/asm/i387.h
index 269255799..269255799 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/i387.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/i387.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/i387_32.h b/ndk/platforms/android-3/arch-x86/include/asm/i387_32.h
index 8563fb904..8563fb904 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/i387_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/i387_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/i8253.h b/ndk/platforms/android-3/arch-x86/include/asm/i8253.h
index 93b1d1a3a..93b1d1a3a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/i8253.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/i8253.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/i8259.h b/ndk/platforms/android-3/arch-x86/include/asm/i8259.h
index c2366ea88..c2366ea88 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/i8259.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/i8259.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ia32_unistd.h b/ndk/platforms/android-3/arch-x86/include/asm/ia32_unistd.h
index 848d228d3..848d228d3 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ia32_unistd.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ia32_unistd.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/io.h b/ndk/platforms/android-3/arch-x86/include/asm/io.h
index ea52e66ea..ea52e66ea 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/io.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/io.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/io_32.h b/ndk/platforms/android-3/arch-x86/include/asm/io_32.h
index f7e0025a4..f7e0025a4 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/io_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/io_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/io_apic.h b/ndk/platforms/android-3/arch-x86/include/asm/io_apic.h
index ed608d309..ed608d309 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/io_apic.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/io_apic.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/io_apic_32.h b/ndk/platforms/android-3/arch-x86/include/asm/io_apic_32.h
index cc858a36b..cc858a36b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/io_apic_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/io_apic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ioctl.h b/ndk/platforms/android-3/arch-x86/include/asm/ioctl.h
index 6e446b6f6..6e446b6f6 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ioctl.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ioctl.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ioctls.h b/ndk/platforms/android-3/arch-x86/include/asm/ioctls.h
index 3aedc0477..3aedc0477 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ioctls.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ioctls.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ipcbuf.h b/ndk/platforms/android-3/arch-x86/include/asm/ipcbuf.h
index 32342c190..32342c190 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ipcbuf.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/irq.h b/ndk/platforms/android-3/arch-x86/include/asm/irq.h
index 07a331de1..07a331de1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/irq.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/irq.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/irq_32.h b/ndk/platforms/android-3/arch-x86/include/asm/irq_32.h
index 31410713a..31410713a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/irq_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/irq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/irqflags.h b/ndk/platforms/android-3/arch-x86/include/asm/irqflags.h
index 4f8466244..4f8466244 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/irqflags.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/irqflags.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/irqflags_32.h b/ndk/platforms/android-3/arch-x86/include/asm/irqflags_32.h
index 9002e44e3..9002e44e3 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/irqflags_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/irqflags_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ist.h b/ndk/platforms/android-3/arch-x86/include/asm/ist.h
index 0abab19bc..0abab19bc 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ist.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ist.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/kmap_types.h b/ndk/platforms/android-3/arch-x86/include/asm/kmap_types.h
index c2313eec1..c2313eec1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/kmap_types.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/kmap_types.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ldt.h b/ndk/platforms/android-3/arch-x86/include/asm/ldt.h
index 19b91ab6a..19b91ab6a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ldt.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ldt.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/linkage.h b/ndk/platforms/android-3/arch-x86/include/asm/linkage.h
index f149e4db1..f149e4db1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/linkage.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/linkage.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/linkage_32.h b/ndk/platforms/android-3/arch-x86/include/asm/linkage_32.h
index 6db10ee96..6db10ee96 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/linkage_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/linkage_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/local.h b/ndk/platforms/android-3/arch-x86/include/asm/local.h
index 85080b86d..85080b86d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/local.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/local.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/local_32.h b/ndk/platforms/android-3/arch-x86/include/asm/local_32.h
index fcad7537a..fcad7537a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/local_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/local_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/math_emu.h b/ndk/platforms/android-3/arch-x86/include/asm/math_emu.h
index 9380d19a6..9380d19a6 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/math_emu.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/math_emu.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc.h b/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc.h
index 849787796..849787796 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc_32.h b/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc_32.h
index 899d60804..899d60804 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mc146818rtc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mman.h b/ndk/platforms/android-3/arch-x86/include/asm/mman.h
index 7eda3195a..7eda3195a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mman.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mman.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mmsegment.h b/ndk/platforms/android-3/arch-x86/include/asm/mmsegment.h
index 76045c7ab..76045c7ab 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mmsegment.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mmsegment.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mmu.h b/ndk/platforms/android-3/arch-x86/include/asm/mmu.h
index 30db10a49..30db10a49 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mmu.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mmu.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/module.h b/ndk/platforms/android-3/arch-x86/include/asm/module.h
index ff292d4ee..ff292d4ee 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/module.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/module.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/module_32.h b/ndk/platforms/android-3/arch-x86/include/asm/module_32.h
index 2e267299b..2e267299b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/module_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/module_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mpspec.h b/ndk/platforms/android-3/arch-x86/include/asm/mpspec.h
index 23365043f..23365043f 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mpspec.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mpspec.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mpspec_32.h b/ndk/platforms/android-3/arch-x86/include/asm/mpspec_32.h
index 7acbe8a78..7acbe8a78 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mpspec_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mpspec_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/mpspec_def.h b/ndk/platforms/android-3/arch-x86/include/asm/mpspec_def.h
index 1f15363c7..1f15363c7 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/mpspec_def.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/mpspec_def.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/msgbuf.h b/ndk/platforms/android-3/arch-x86/include/asm/msgbuf.h
index 8843e78ea..8843e78ea 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/msgbuf.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/msr-index.h b/ndk/platforms/android-3/arch-x86/include/asm/msr-index.h
index 8ea204ed8..8ea204ed8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/msr-index.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/msr-index.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/msr.h b/ndk/platforms/android-3/arch-x86/include/asm/msr.h
index f1da91779..f1da91779 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/msr.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/msr.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/page.h b/ndk/platforms/android-3/arch-x86/include/asm/page.h
index e6dcf2730..e6dcf2730 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/page.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/page.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/page_32.h b/ndk/platforms/android-3/arch-x86/include/asm/page_32.h
index 718cf955a..718cf955a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/page_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/page_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/param.h b/ndk/platforms/android-3/arch-x86/include/asm/param.h
index 3fafd551d..3fafd551d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/param.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/param.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/paravirt.h b/ndk/platforms/android-3/arch-x86/include/asm/paravirt.h
index ab0d08e17..ab0d08e17 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/paravirt.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/paravirt.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pda.h b/ndk/platforms/android-3/arch-x86/include/asm/pda.h
index 671122452..671122452 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pda.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pda.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/percpu.h b/ndk/platforms/android-3/arch-x86/include/asm/percpu.h
index 7740e67d4..7740e67d4 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/percpu.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/percpu.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/percpu_32.h b/ndk/platforms/android-3/arch-x86/include/asm/percpu_32.h
index 21135d6a6..21135d6a6 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/percpu_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/percpu_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgalloc.h b/ndk/platforms/android-3/arch-x86/include/asm/pgalloc.h
index d5a032b67..d5a032b67 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgalloc.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgalloc.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgalloc_32.h b/ndk/platforms/android-3/arch-x86/include/asm/pgalloc_32.h
index bc0f88482..bc0f88482 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgalloc_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgalloc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level-defs.h b/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level-defs.h
index 9edc6c522..9edc6c522 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level-defs.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level-defs.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level.h b/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level.h
index 7ade4ed46..7ade4ed46 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgtable-2level.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgtable.h b/ndk/platforms/android-3/arch-x86/include/asm/pgtable.h
index 797e47302..797e47302 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgtable.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgtable.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/pgtable_32.h b/ndk/platforms/android-3/arch-x86/include/asm/pgtable_32.h
index c63ba938b..c63ba938b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/pgtable_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/pgtable_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/poll.h b/ndk/platforms/android-3/arch-x86/include/asm/poll.h
index 5b16673b5..5b16673b5 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/poll.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/poll.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/posix_types.h b/ndk/platforms/android-3/arch-x86/include/asm/posix_types.h
index 79bb4903f..79bb4903f 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/posix_types.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/posix_types.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/posix_types_32.h b/ndk/platforms/android-3/arch-x86/include/asm/posix_types_32.h
index 97a8b6919..97a8b6919 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/posix_types_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/posix_types_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/prctl.h b/ndk/platforms/android-3/arch-x86/include/asm/prctl.h
index 8852ca703..8852ca703 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/prctl.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/prctl.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/processor-flags.h b/ndk/platforms/android-3/arch-x86/include/asm/processor-flags.h
index 79e8f7d7d..79e8f7d7d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/processor-flags.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/processor-flags.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/processor.h b/ndk/platforms/android-3/arch-x86/include/asm/processor.h
index 7d4774961..7d4774961 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/processor.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/processor.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/processor_32.h b/ndk/platforms/android-3/arch-x86/include/asm/processor_32.h
index 539edd1a0..539edd1a0 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/processor_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/processor_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ptrace-abi.h b/ndk/platforms/android-3/arch-x86/include/asm/ptrace-abi.h
index 3e6ea082d..3e6ea082d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ptrace-abi.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ptrace-abi.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/ptrace.h b/ndk/platforms/android-3/arch-x86/include/asm/ptrace.h
index 4743e0fca..4743e0fca 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/ptrace.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/ptrace.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/required-features.h b/ndk/platforms/android-3/arch-x86/include/asm/required-features.h
index a96517a0a..a96517a0a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/required-features.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/required-features.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/resource.h b/ndk/platforms/android-3/arch-x86/include/asm/resource.h
index 29d9e12e8..29d9e12e8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/resource.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/resource.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/rwlock.h b/ndk/platforms/android-3/arch-x86/include/asm/rwlock.h
index 3693542bd..3693542bd 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/rwlock.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/rwlock.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/scatterlist.h b/ndk/platforms/android-3/arch-x86/include/asm/scatterlist.h
index fa4d0cc60..fa4d0cc60 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/scatterlist.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/scatterlist.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/scatterlist_32.h b/ndk/platforms/android-3/arch-x86/include/asm/scatterlist_32.h
index 29044c3e5..29044c3e5 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/scatterlist_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/scatterlist_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/sections.h b/ndk/platforms/android-3/arch-x86/include/asm/sections.h
index a21da3eb9..a21da3eb9 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/sections.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/sections.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/segment.h b/ndk/platforms/android-3/arch-x86/include/asm/segment.h
index 6877a80b2..6877a80b2 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/segment.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/segment.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/segment_32.h b/ndk/platforms/android-3/arch-x86/include/asm/segment_32.h
index 54b312bc2..54b312bc2 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/segment_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/segment_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/semaphore.h b/ndk/platforms/android-3/arch-x86/include/asm/semaphore.h
index 8b4c59572..8b4c59572 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/semaphore.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/semaphore.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/semaphore_32.h b/ndk/platforms/android-3/arch-x86/include/asm/semaphore_32.h
index babe77964..babe77964 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/semaphore_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/semaphore_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/sembuf.h b/ndk/platforms/android-3/arch-x86/include/asm/sembuf.h
index 1695208aa..1695208aa 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/sembuf.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/sembuf.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/setup.h b/ndk/platforms/android-3/arch-x86/include/asm/setup.h
index 696ed97e1..696ed97e1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/setup.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/setup.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/shmbuf.h b/ndk/platforms/android-3/arch-x86/include/asm/shmbuf.h
index 314ccb7d8..314ccb7d8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/shmbuf.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/shmparam.h b/ndk/platforms/android-3/arch-x86/include/asm/shmparam.h
index e667ba1c8..e667ba1c8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/shmparam.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/shmparam.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/sigcontext.h b/ndk/platforms/android-3/arch-x86/include/asm/sigcontext.h
index a8f76f0c1..a8f76f0c1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/sigcontext.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/siginfo.h b/ndk/platforms/android-3/arch-x86/include/asm/siginfo.h
index 0d21d227a..0d21d227a 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/siginfo.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/siginfo.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/signal.h b/ndk/platforms/android-3/arch-x86/include/asm/signal.h
index 6d84eabbd..6d84eabbd 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/signal.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/signal.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/smp.h b/ndk/platforms/android-3/arch-x86/include/asm/smp.h
index 40d460133..40d460133 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/smp.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/smp.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/smp_32.h b/ndk/platforms/android-3/arch-x86/include/asm/smp_32.h
index f093a240d..f093a240d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/smp_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/smp_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/socket.h b/ndk/platforms/android-3/arch-x86/include/asm/socket.h
index 27d243f14..27d243f14 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/socket.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/socket.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/sockios.h b/ndk/platforms/android-3/arch-x86/include/asm/sockios.h
index ebdfa98f4..ebdfa98f4 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/sockios.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/sockios.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/spinlock.h b/ndk/platforms/android-3/arch-x86/include/asm/spinlock.h
index 10d123aa7..10d123aa7 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/spinlock.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/spinlock.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/spinlock_32.h b/ndk/platforms/android-3/arch-x86/include/asm/spinlock_32.h
index 171783e94..171783e94 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/spinlock_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/spinlock_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/spinlock_types.h b/ndk/platforms/android-3/arch-x86/include/asm/spinlock_types.h
index ab914c4e8..ab914c4e8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/spinlock_types.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/spinlock_types.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/stat.h b/ndk/platforms/android-3/arch-x86/include/asm/stat.h
index 837d716fa..837d716fa 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/stat.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/stat.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/statfs.h b/ndk/platforms/android-3/arch-x86/include/asm/statfs.h
index 592d864c5..592d864c5 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/statfs.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/statfs.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/string.h b/ndk/platforms/android-3/arch-x86/include/asm/string.h
index 92fa29122..92fa29122 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/string.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/string.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/string_32.h b/ndk/platforms/android-3/arch-x86/include/asm/string_32.h
index 58a72d77f..58a72d77f 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/string_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/string_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/swiotlb.h b/ndk/platforms/android-3/arch-x86/include/asm/swiotlb.h
index 5ee37b3aa..5ee37b3aa 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/swiotlb.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/swiotlb.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/system.h b/ndk/platforms/android-3/arch-x86/include/asm/system.h
index 834193b3b..834193b3b 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/system.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/system.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/system_32.h b/ndk/platforms/android-3/arch-x86/include/asm/system_32.h
index d799ae648..d799ae648 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/system_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/system_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/termbits.h b/ndk/platforms/android-3/arch-x86/include/asm/termbits.h
index 6d7c5e8c1..6d7c5e8c1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/termbits.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/termbits.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/termios.h b/ndk/platforms/android-3/arch-x86/include/asm/termios.h
index 01bdca404..01bdca404 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/termios.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/termios.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/thread_info.h b/ndk/platforms/android-3/arch-x86/include/asm/thread_info.h
index ff46b08a8..ff46b08a8 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/thread_info.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/thread_info.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/thread_info_32.h b/ndk/platforms/android-3/arch-x86/include/asm/thread_info_32.h
index 5664ef80f..5664ef80f 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/thread_info_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/thread_info_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/tlbflush.h b/ndk/platforms/android-3/arch-x86/include/asm/tlbflush.h
index fd6b22630..fd6b22630 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/tlbflush.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/tlbflush.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/tlbflush_32.h b/ndk/platforms/android-3/arch-x86/include/asm/tlbflush_32.h
index 8ebff80ca..8ebff80ca 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/tlbflush_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/tlbflush_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/tsc.h b/ndk/platforms/android-3/arch-x86/include/asm/tsc.h
index 2528cd172..2528cd172 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/tsc.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/tsc.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/types.h b/ndk/platforms/android-3/arch-x86/include/asm/types.h
index 4af92b0cd..4af92b0cd 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/types.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/types.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/uaccess.h b/ndk/platforms/android-3/arch-x86/include/asm/uaccess.h
index b2bec6995..b2bec6995 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/uaccess.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/uaccess.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/uaccess_32.h b/ndk/platforms/android-3/arch-x86/include/asm/uaccess_32.h
index 9827fc434..9827fc434 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/uaccess_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/uaccess_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/unaligned.h b/ndk/platforms/android-3/arch-x86/include/asm/unaligned.h
index ce7a8a772..ce7a8a772 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/unaligned.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/unaligned.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/unistd.h b/ndk/platforms/android-3/arch-x86/include/asm/unistd.h
index 769f83618..769f83618 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/unistd.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/unistd.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/unistd_32.h b/ndk/platforms/android-3/arch-x86/include/asm/unistd_32.h
index b3d8b19b5..b3d8b19b5 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/unistd_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/unistd_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/user.h b/ndk/platforms/android-3/arch-x86/include/asm/user.h
index 980b0aaad..980b0aaad 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/user.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/user.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/user32.h b/ndk/platforms/android-3/arch-x86/include/asm/user32.h
index 89eabb183..89eabb183 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/user32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/user32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/user_32.h b/ndk/platforms/android-3/arch-x86/include/asm/user_32.h
index 8e0296c97..8e0296c97 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/user_32.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/user_32.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/vm86.h b/ndk/platforms/android-3/arch-x86/include/asm/vm86.h
index d0e71f13c..d0e71f13c 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/vm86.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/vm86.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/voyager.h b/ndk/platforms/android-3/arch-x86/include/asm/voyager.h
index c6f50a98d..c6f50a98d 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/voyager.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/voyager.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/vsyscall.h b/ndk/platforms/android-3/arch-x86/include/asm/vsyscall.h
index a7bee3b63..a7bee3b63 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/vsyscall.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/vsyscall.h
diff --git a/ndk/platforms/android-5/arch-x86/include/asm/xen/hypercall.h b/ndk/platforms/android-3/arch-x86/include/asm/xen/hypercall.h
index 3c523a8c1..3c523a8c1 100644
--- a/ndk/platforms/android-5/arch-x86/include/asm/xen/hypercall.h
+++ b/ndk/platforms/android-3/arch-x86/include/asm/xen/hypercall.h
diff --git a/ndk/platforms/android-5/arch-x86/include/endian.h b/ndk/platforms/android-3/arch-x86/include/endian.h
index ad37919f3..ad37919f3 100644
--- a/ndk/platforms/android-5/arch-x86/include/endian.h
+++ b/ndk/platforms/android-3/arch-x86/include/endian.h
diff --git a/ndk/platforms/android-5/arch-x86/include/fenv.h b/ndk/platforms/android-3/arch-x86/include/fenv.h
index b124366ac..b124366ac 100644
--- a/ndk/platforms/android-5/arch-x86/include/fenv.h
+++ b/ndk/platforms/android-3/arch-x86/include/fenv.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/_types.h b/ndk/platforms/android-3/arch-x86/include/machine/_types.h
index be4f6e409..e9280a5da 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/_types.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/_types.h
@@ -36,8 +36,8 @@
 #define _I386__TYPES_H_
 
 /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */
-#ifndef _SIZE_T
-#  define _SIZE_T
+#ifndef _SIZE_T_DEFINED_
+#  define _SIZE_T_DEFINED_
 #  ifdef ANDROID
      typedef unsigned int  size_t;
 #  else
@@ -54,9 +54,6 @@ typedef long int       ssize_t;
 typedef long           ptrdiff_t;
 #endif
 
-#define _OFF_T_DEFINED_
-#define _SIZE_T_DEFINED_
-
 #include <linux/types.h>
 
 /* 7.18.1.1 Exact-width integer types */
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/asm.h b/ndk/platforms/android-3/arch-x86/include/machine/asm.h
index 7a23060a9..7a23060a9 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/asm.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/asm.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/cdefs.h b/ndk/platforms/android-3/arch-x86/include/machine/cdefs.h
index 6efee6ac4..6efee6ac4 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/cdefs.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/cdefs.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/exec.h b/ndk/platforms/android-3/arch-x86/include/machine/exec.h
index d09174191..d09174191 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/exec.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/exec.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/ieee.h b/ndk/platforms/android-3/arch-x86/include/machine/ieee.h
index 55b370327..55b370327 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/ieee.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/ieee.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/internal_types.h b/ndk/platforms/android-3/arch-x86/include/machine/internal_types.h
index 4d1833cf8..4d1833cf8 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/internal_types.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/internal_types.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/kernel.h b/ndk/platforms/android-3/arch-x86/include/machine/kernel.h
index 19d157728..19d157728 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/kernel.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/kernel.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/limits.h b/ndk/platforms/android-3/arch-x86/include/machine/limits.h
index 86fd85482..86fd85482 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/limits.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/limits.h
diff --git a/ndk/platforms/android-5/arch-x86/include/machine/setjmp.h b/ndk/platforms/android-3/arch-x86/include/machine/setjmp.h
index ded095da9..ded095da9 100644
--- a/ndk/platforms/android-5/arch-x86/include/machine/setjmp.h
+++ b/ndk/platforms/android-3/arch-x86/include/machine/setjmp.h
diff --git a/ndk/platforms/android-5/arch-x86/lib/crtbegin_dynamic.o b/ndk/platforms/android-3/arch-x86/lib/crtbegin_dynamic.o
index c620c30ba..c620c30ba 100644
--- a/ndk/platforms/android-5/arch-x86/lib/crtbegin_dynamic.o
+++ b/ndk/platforms/android-3/arch-x86/lib/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-5/arch-x86/lib/crtbegin_static.o b/ndk/platforms/android-3/arch-x86/lib/crtbegin_static.o
index c7505ee8c..c7505ee8c 100644
--- a/ndk/platforms/android-5/arch-x86/lib/crtbegin_static.o
+++ b/ndk/platforms/android-3/arch-x86/lib/crtbegin_static.o
diff --git a/ndk/platforms/android-5/arch-x86/lib/crtend_android.o b/ndk/platforms/android-3/arch-x86/lib/crtend_android.o
index 2a835b7d4..2a835b7d4 100644
--- a/ndk/platforms/android-5/arch-x86/lib/crtend_android.o
+++ b/ndk/platforms/android-3/arch-x86/lib/crtend_android.o
diff --git a/ndk/platforms/android-5/arch-x86/lib/libc.a b/ndk/platforms/android-3/arch-x86/lib/libc.a
index 15403b190..15403b190 100644
--- a/ndk/platforms/android-5/arch-x86/lib/libc.a
+++ b/ndk/platforms/android-3/arch-x86/lib/libc.a
diff --git a/ndk/platforms/android-3/arch-x86/lib/libc.so b/ndk/platforms/android-3/arch-x86/lib/libc.so
new file mode 100755
index 000000000..fb6851cd8
--- /dev/null
+++ b/ndk/platforms/android-3/arch-x86/lib/libc.so
diff --git a/ndk/platforms/android-5/arch-x86/lib/libc_common.a b/ndk/platforms/android-3/arch-x86/lib/libc_common.a
index aed18c746..aed18c746 100644
--- a/ndk/platforms/android-5/arch-x86/lib/libc_common.a
+++ b/ndk/platforms/android-3/arch-x86/lib/libc_common.a
diff --git a/ndk/platforms/android-5/arch-x86/lib/libdl.so b/ndk/platforms/android-3/arch-x86/lib/libdl.so
index 3f2cbeb2a..3f2cbeb2a 100755
--- a/ndk/platforms/android-5/arch-x86/lib/libdl.so
+++ b/ndk/platforms/android-3/arch-x86/lib/libdl.so
diff --git a/ndk/platforms/android-5/arch-x86/lib/libm.a b/ndk/platforms/android-3/arch-x86/lib/libm.a
index 4e7c1f960..4e7c1f960 100644
--- a/ndk/platforms/android-5/arch-x86/lib/libm.a
+++ b/ndk/platforms/android-3/arch-x86/lib/libm.a
diff --git a/ndk/platforms/android-5/arch-x86/lib/libm.so b/ndk/platforms/android-3/arch-x86/lib/libm.so
index 1f4649437..1f4649437 100755
--- a/ndk/platforms/android-5/arch-x86/lib/libm.so
+++ b/ndk/platforms/android-3/arch-x86/lib/libm.so
diff --git a/ndk/platforms/android-5/arch-x86/lib/libstdc++.a b/ndk/platforms/android-3/arch-x86/lib/libstdc++.a
index ff5c78ee9..ff5c78ee9 100644
--- a/ndk/platforms/android-5/arch-x86/lib/libstdc++.a
+++ b/ndk/platforms/android-3/arch-x86/lib/libstdc++.a
diff --git a/ndk/platforms/android-5/arch-x86/lib/libstdc++.so b/ndk/platforms/android-3/arch-x86/lib/libstdc++.so
index 79124d170..79124d170 100755
--- a/ndk/platforms/android-5/arch-x86/lib/libstdc++.so
+++ b/ndk/platforms/android-3/arch-x86/lib/libstdc++.so
diff --git a/ndk/platforms/android-5/arch-x86/lib/libthread_db.a b/ndk/platforms/android-3/arch-x86/lib/libthread_db.a
index abe0957cf..abe0957cf 100644
--- a/ndk/platforms/android-5/arch-x86/lib/libthread_db.a
+++ b/ndk/platforms/android-3/arch-x86/lib/libthread_db.a
diff --git a/ndk/platforms/android-5/arch-x86/lib/libthread_db.so b/ndk/platforms/android-3/arch-x86/lib/libthread_db.so
index 861427450..861427450 100755
--- a/ndk/platforms/android-5/arch-x86/lib/libthread_db.so
+++ b/ndk/platforms/android-3/arch-x86/lib/libthread_db.so