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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/a.out.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/acpi.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/acpi_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/alternative.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/alternative_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/apic.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/apic_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/apicdef.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/apicdef_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/atomic.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/atomic_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/auxvec.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/bitops.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/bitops_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/bug.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/byteorder.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cache.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cacheflush.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cmpxchg.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cmpxchg_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cpufeature.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cpufeature_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/cputime.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/current.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/current_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/delay.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/desc.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/desc_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/desc_defs.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/div64.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dma-mapping.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dma-mapping_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dma.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dma_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dwarf2.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/dwarf2_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/e820.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/elf.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/errno.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/fcntl.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/fixmap.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/fixmap_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/genapic.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/genapic_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/hardirq.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/hardirq_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/highmem.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/hw_irq.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/hw_irq_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/i387.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/i387_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/i8253.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/i8259.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ia32_unistd.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/io.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/io_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/io_apic.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/io_apic_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ioctl.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ioctls.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ipcbuf.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/irq.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/irq_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/irqflags.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/irqflags_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ist.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/kmap_types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ldt.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/linkage.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/linkage_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/local.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/local_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/math_emu.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mman.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mmsegment.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mmu.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/module.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/module_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mpspec.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mpspec_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/mpspec_def.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/msgbuf.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/msr-index.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/msr.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/page.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/page_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/param.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/paravirt.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pda.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/percpu.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/percpu_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgalloc.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgalloc_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level-defs.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgtable.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/pgtable_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/poll.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/posix_types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/posix_types_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/prctl.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/processor-flags.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/processor.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/processor_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ptrace-abi.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/ptrace.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/required-features.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/resource.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/rwlock.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/scatterlist.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/scatterlist_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/sections.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/segment.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/segment_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/semaphore.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/semaphore_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/sembuf.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/setup.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/shmbuf.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/shmparam.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/sigcontext.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/siginfo.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/signal.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/smp.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/smp_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/socket.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/sockios.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/spinlock.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/spinlock_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/spinlock_types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/stat.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/statfs.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/string.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/string_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/swiotlb.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/system.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/system_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/termbits.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/termios.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/thread_info.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/thread_info_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/tlbflush.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/tlbflush_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/tsc.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/uaccess.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/uaccess_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/unaligned.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/unistd.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/unistd_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/user.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/user32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/user_32.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/vm86.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/voyager.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/vsyscall.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/asm/xen/hypercall.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/endian.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/fenv.h
rename to 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
similarity index 98%
rename from ndk/platforms/android-5/arch-x86/include/machine/_types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/asm.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/cdefs.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/exec.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/ieee.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/internal_types.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/kernel.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/limits.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/include/machine/setjmp.h
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/crtbegin_dynamic.o
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/crtbegin_static.o
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/crtend_android.o
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libc.a
rename to 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
Binary files /dev/null and b/ndk/platforms/android-3/arch-x86/lib/libc.so differ
diff --git a/ndk/platforms/android-5/arch-x86/lib/libc_common.a b/ndk/platforms/android-3/arch-x86/lib/libc_common.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libc_common.a
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libdl.so
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libm.a
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libm.so
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libstdc++.a
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libstdc++.so
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libthread_db.a
rename to 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
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/lib/libthread_db.so
rename to ndk/platforms/android-3/arch-x86/lib/libthread_db.so