Unify NDK platform headers.

This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:

- common headers:        android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs:    android-N/arch-A/usr/lib     --> android-N/arch-A/lib

Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276

NOTE: This also contains careful separation of API-level-specific headers.
      For example, platforms/android-5/include/pthread.h contains new function
      declarations that are not available when using platforms/android-3/include/pthread.h

NOTE: The NDK's build-platforms.sh script has been updated to understand the new
      layout. This change in develeopment/ndk does not change the layout of
      platform files under $NDK/platforms after build-platforms.sh is called.
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/a.out.h b/ndk/platforms/android-3/arch-arm/include/asm/a.out.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/a.out.h
rename to ndk/platforms/android-3/arch-arm/include/asm/a.out.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/board-perseus2.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board-perseus2.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/board-perseus2.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/board.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/board.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/board.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/cpu.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/cpu.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/cpu.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/dma.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/dma.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/dma.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/fpga.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/fpga.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/fpga.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/gpio-switch.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio-switch.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/gpio-switch.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/gpio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/gpio.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/gpio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/hardware.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/hardware.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/hardware.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/io.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/io.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/io.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/io.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/irqs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/irqs.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/irqs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/mcbsp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mcbsp.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/mcbsp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/memory.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/memory.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/memory.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/mtd-xip.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mtd-xip.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/mtd-xip.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/mux.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/mux.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/mux.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/omap24xx.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/omap24xx.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/omap24xx.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/serial.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/serial.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/serial.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/timex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/timex.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/timex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h b/ndk/platforms/android-3/arch-arm/include/asm/arch/vmalloc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/arch/vmalloc.h
rename to ndk/platforms/android-3/arch-arm/include/asm/arch/vmalloc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/atomic.h b/ndk/platforms/android-3/arch-arm/include/asm/atomic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/atomic.h
rename to ndk/platforms/android-3/arch-arm/include/asm/atomic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/auxvec.h b/ndk/platforms/android-3/arch-arm/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/auxvec.h
rename to ndk/platforms/android-3/arch-arm/include/asm/auxvec.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/bitops.h b/ndk/platforms/android-3/arch-arm/include/asm/bitops.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/bitops.h
rename to ndk/platforms/android-3/arch-arm/include/asm/bitops.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/byteorder.h b/ndk/platforms/android-3/arch-arm/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/byteorder.h
rename to ndk/platforms/android-3/arch-arm/include/asm/byteorder.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/cache.h b/ndk/platforms/android-3/arch-arm/include/asm/cache.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/cache.h
rename to ndk/platforms/android-3/arch-arm/include/asm/cache.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/cacheflush.h b/ndk/platforms/android-3/arch-arm/include/asm/cacheflush.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/cacheflush.h
rename to ndk/platforms/android-3/arch-arm/include/asm/cacheflush.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/cputime.h b/ndk/platforms/android-3/arch-arm/include/asm/cputime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/cputime.h
rename to ndk/platforms/android-3/arch-arm/include/asm/cputime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/delay.h b/ndk/platforms/android-3/arch-arm/include/asm/delay.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/delay.h
rename to ndk/platforms/android-3/arch-arm/include/asm/delay.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/div64.h b/ndk/platforms/android-3/arch-arm/include/asm/div64.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/div64.h
rename to ndk/platforms/android-3/arch-arm/include/asm/div64.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/dma-mapping.h b/ndk/platforms/android-3/arch-arm/include/asm/dma-mapping.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/dma-mapping.h
rename to ndk/platforms/android-3/arch-arm/include/asm/dma-mapping.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/dma.h b/ndk/platforms/android-3/arch-arm/include/asm/dma.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/dma.h
rename to ndk/platforms/android-3/arch-arm/include/asm/dma.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/domain.h b/ndk/platforms/android-3/arch-arm/include/asm/domain.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/domain.h
rename to ndk/platforms/android-3/arch-arm/include/asm/domain.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/dyntick.h b/ndk/platforms/android-3/arch-arm/include/asm/dyntick.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/dyntick.h
rename to ndk/platforms/android-3/arch-arm/include/asm/dyntick.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/elf.h b/ndk/platforms/android-3/arch-arm/include/asm/elf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/elf.h
rename to ndk/platforms/android-3/arch-arm/include/asm/elf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/errno.h b/ndk/platforms/android-3/arch-arm/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/errno.h
rename to ndk/platforms/android-3/arch-arm/include/asm/errno.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/fcntl.h b/ndk/platforms/android-3/arch-arm/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/fcntl.h
rename to ndk/platforms/android-3/arch-arm/include/asm/fcntl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/fpstate.h b/ndk/platforms/android-3/arch-arm/include/asm/fpstate.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/fpstate.h
rename to ndk/platforms/android-3/arch-arm/include/asm/fpstate.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/glue.h b/ndk/platforms/android-3/arch-arm/include/asm/glue.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/glue.h
rename to ndk/platforms/android-3/arch-arm/include/asm/glue.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/hardirq.h b/ndk/platforms/android-3/arch-arm/include/asm/hardirq.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/hardirq.h
rename to ndk/platforms/android-3/arch-arm/include/asm/hardirq.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/hardware.h b/ndk/platforms/android-3/arch-arm/include/asm/hardware.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/hardware.h
rename to ndk/platforms/android-3/arch-arm/include/asm/hardware.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/hw_irq.h b/ndk/platforms/android-3/arch-arm/include/asm/hw_irq.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/hw_irq.h
rename to ndk/platforms/android-3/arch-arm/include/asm/hw_irq.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/ide.h b/ndk/platforms/android-3/arch-arm/include/asm/ide.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/ide.h
rename to ndk/platforms/android-3/arch-arm/include/asm/ide.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/io.h b/ndk/platforms/android-3/arch-arm/include/asm/io.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/io.h
rename to ndk/platforms/android-3/arch-arm/include/asm/io.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/ioctl.h b/ndk/platforms/android-3/arch-arm/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/ioctl.h
rename to ndk/platforms/android-3/arch-arm/include/asm/ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/ioctls.h b/ndk/platforms/android-3/arch-arm/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/ioctls.h
rename to ndk/platforms/android-3/arch-arm/include/asm/ioctls.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/ipcbuf.h b/ndk/platforms/android-3/arch-arm/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/ipcbuf.h
rename to ndk/platforms/android-3/arch-arm/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/irq.h b/ndk/platforms/android-3/arch-arm/include/asm/irq.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/irq.h
rename to ndk/platforms/android-3/arch-arm/include/asm/irq.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/linkage.h b/ndk/platforms/android-3/arch-arm/include/asm/linkage.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/linkage.h
rename to ndk/platforms/android-3/arch-arm/include/asm/linkage.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/local.h b/ndk/platforms/android-3/arch-arm/include/asm/local.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/local.h
rename to ndk/platforms/android-3/arch-arm/include/asm/local.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/locks.h b/ndk/platforms/android-3/arch-arm/include/asm/locks.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/locks.h
rename to ndk/platforms/android-3/arch-arm/include/asm/locks.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/mc146818rtc.h b/ndk/platforms/android-3/arch-arm/include/asm/mc146818rtc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/mc146818rtc.h
rename to ndk/platforms/android-3/arch-arm/include/asm/mc146818rtc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/memory.h b/ndk/platforms/android-3/arch-arm/include/asm/memory.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/memory.h
rename to ndk/platforms/android-3/arch-arm/include/asm/memory.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/mman.h b/ndk/platforms/android-3/arch-arm/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/mman.h
rename to ndk/platforms/android-3/arch-arm/include/asm/mman.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/module.h b/ndk/platforms/android-3/arch-arm/include/asm/module.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/module.h
rename to ndk/platforms/android-3/arch-arm/include/asm/module.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/msgbuf.h b/ndk/platforms/android-3/arch-arm/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/msgbuf.h
rename to ndk/platforms/android-3/arch-arm/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/mtd-xip.h b/ndk/platforms/android-3/arch-arm/include/asm/mtd-xip.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/mtd-xip.h
rename to ndk/platforms/android-3/arch-arm/include/asm/mtd-xip.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/page.h b/ndk/platforms/android-3/arch-arm/include/asm/page.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/page.h
rename to ndk/platforms/android-3/arch-arm/include/asm/page.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/param.h b/ndk/platforms/android-3/arch-arm/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/param.h
rename to ndk/platforms/android-3/arch-arm/include/asm/param.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/percpu.h b/ndk/platforms/android-3/arch-arm/include/asm/percpu.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/percpu.h
rename to ndk/platforms/android-3/arch-arm/include/asm/percpu.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/pgalloc.h b/ndk/platforms/android-3/arch-arm/include/asm/pgalloc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/pgalloc.h
rename to ndk/platforms/android-3/arch-arm/include/asm/pgalloc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable-hwdef.h b/ndk/platforms/android-3/arch-arm/include/asm/pgtable-hwdef.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable-hwdef.h
rename to ndk/platforms/android-3/arch-arm/include/asm/pgtable-hwdef.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable.h b/ndk/platforms/android-3/arch-arm/include/asm/pgtable.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/pgtable.h
rename to ndk/platforms/android-3/arch-arm/include/asm/pgtable.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/poll.h b/ndk/platforms/android-3/arch-arm/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/poll.h
rename to ndk/platforms/android-3/arch-arm/include/asm/poll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/posix_types.h b/ndk/platforms/android-3/arch-arm/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/posix_types.h
rename to ndk/platforms/android-3/arch-arm/include/asm/posix_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/proc-fns.h b/ndk/platforms/android-3/arch-arm/include/asm/proc-fns.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/proc-fns.h
rename to ndk/platforms/android-3/arch-arm/include/asm/proc-fns.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/processor.h b/ndk/platforms/android-3/arch-arm/include/asm/processor.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/processor.h
rename to ndk/platforms/android-3/arch-arm/include/asm/processor.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/procinfo.h b/ndk/platforms/android-3/arch-arm/include/asm/procinfo.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/procinfo.h
rename to ndk/platforms/android-3/arch-arm/include/asm/procinfo.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/ptrace.h b/ndk/platforms/android-3/arch-arm/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/ptrace.h
rename to ndk/platforms/android-3/arch-arm/include/asm/ptrace.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/resource.h b/ndk/platforms/android-3/arch-arm/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/resource.h
rename to ndk/platforms/android-3/arch-arm/include/asm/resource.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/scatterlist.h b/ndk/platforms/android-3/arch-arm/include/asm/scatterlist.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/scatterlist.h
rename to ndk/platforms/android-3/arch-arm/include/asm/scatterlist.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/semaphore.h b/ndk/platforms/android-3/arch-arm/include/asm/semaphore.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/semaphore.h
rename to ndk/platforms/android-3/arch-arm/include/asm/semaphore.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/sembuf.h b/ndk/platforms/android-3/arch-arm/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/sembuf.h
rename to ndk/platforms/android-3/arch-arm/include/asm/sembuf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/shmbuf.h b/ndk/platforms/android-3/arch-arm/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/shmbuf.h
rename to ndk/platforms/android-3/arch-arm/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/shmparam.h b/ndk/platforms/android-3/arch-arm/include/asm/shmparam.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/shmparam.h
rename to ndk/platforms/android-3/arch-arm/include/asm/shmparam.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/sigcontext.h b/ndk/platforms/android-3/arch-arm/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/sigcontext.h
rename to ndk/platforms/android-3/arch-arm/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/siginfo.h b/ndk/platforms/android-3/arch-arm/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/siginfo.h
rename to ndk/platforms/android-3/arch-arm/include/asm/siginfo.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/signal.h b/ndk/platforms/android-3/arch-arm/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/signal.h
rename to ndk/platforms/android-3/arch-arm/include/asm/signal.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/sizes.h b/ndk/platforms/android-3/arch-arm/include/asm/sizes.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/sizes.h
rename to ndk/platforms/android-3/arch-arm/include/asm/sizes.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/smp.h b/ndk/platforms/android-3/arch-arm/include/asm/smp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/smp.h
rename to ndk/platforms/android-3/arch-arm/include/asm/smp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/socket.h b/ndk/platforms/android-3/arch-arm/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/socket.h
rename to ndk/platforms/android-3/arch-arm/include/asm/socket.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/sockios.h b/ndk/platforms/android-3/arch-arm/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/sockios.h
rename to ndk/platforms/android-3/arch-arm/include/asm/sockios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock.h b/ndk/platforms/android-3/arch-arm/include/asm/spinlock.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock.h
rename to ndk/platforms/android-3/arch-arm/include/asm/spinlock.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock_types.h b/ndk/platforms/android-3/arch-arm/include/asm/spinlock_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/spinlock_types.h
rename to ndk/platforms/android-3/arch-arm/include/asm/spinlock_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/stat.h b/ndk/platforms/android-3/arch-arm/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/stat.h
rename to ndk/platforms/android-3/arch-arm/include/asm/stat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/statfs.h b/ndk/platforms/android-3/arch-arm/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/statfs.h
rename to ndk/platforms/android-3/arch-arm/include/asm/statfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/suspend.h b/ndk/platforms/android-3/arch-arm/include/asm/suspend.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/suspend.h
rename to ndk/platforms/android-3/arch-arm/include/asm/suspend.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/system.h b/ndk/platforms/android-3/arch-arm/include/asm/system.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/system.h
rename to ndk/platforms/android-3/arch-arm/include/asm/system.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/termbits.h b/ndk/platforms/android-3/arch-arm/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/termbits.h
rename to ndk/platforms/android-3/arch-arm/include/asm/termbits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/termios.h b/ndk/platforms/android-3/arch-arm/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/termios.h
rename to ndk/platforms/android-3/arch-arm/include/asm/termios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/thread_info.h b/ndk/platforms/android-3/arch-arm/include/asm/thread_info.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/thread_info.h
rename to ndk/platforms/android-3/arch-arm/include/asm/thread_info.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/timex.h b/ndk/platforms/android-3/arch-arm/include/asm/timex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/timex.h
rename to ndk/platforms/android-3/arch-arm/include/asm/timex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/tlbflush.h b/ndk/platforms/android-3/arch-arm/include/asm/tlbflush.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/tlbflush.h
rename to ndk/platforms/android-3/arch-arm/include/asm/tlbflush.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/topology.h b/ndk/platforms/android-3/arch-arm/include/asm/topology.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/topology.h
rename to ndk/platforms/android-3/arch-arm/include/asm/topology.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/types.h b/ndk/platforms/android-3/arch-arm/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/types.h
rename to ndk/platforms/android-3/arch-arm/include/asm/types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/uaccess.h b/ndk/platforms/android-3/arch-arm/include/asm/uaccess.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/uaccess.h
rename to ndk/platforms/android-3/arch-arm/include/asm/uaccess.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/unaligned.h b/ndk/platforms/android-3/arch-arm/include/asm/unaligned.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/unaligned.h
rename to ndk/platforms/android-3/arch-arm/include/asm/unaligned.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/unistd.h b/ndk/platforms/android-3/arch-arm/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/unistd.h
rename to ndk/platforms/android-3/arch-arm/include/asm/unistd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/user.h b/ndk/platforms/android-3/arch-arm/include/asm/user.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/user.h
rename to ndk/platforms/android-3/arch-arm/include/asm/user.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm/vga.h b/ndk/platforms/android-3/arch-arm/include/asm/vga.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm/vga.h
rename to ndk/platforms/android-3/arch-arm/include/asm/vga.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/fenv.h b/ndk/platforms/android-3/arch-arm/include/fenv.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/fenv.h
rename to ndk/platforms/android-3/arch-arm/include/fenv.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/_types.h b/ndk/platforms/android-3/arch-arm/include/machine/_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/_types.h
rename to ndk/platforms/android-3/arch-arm/include/machine/_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/asm.h b/ndk/platforms/android-3/arch-arm/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/asm.h
rename to ndk/platforms/android-3/arch-arm/include/machine/asm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/cdefs.h b/ndk/platforms/android-3/arch-arm/include/machine/cdefs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/cdefs.h
rename to ndk/platforms/android-3/arch-arm/include/machine/cdefs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/cpu-features.h b/ndk/platforms/android-3/arch-arm/include/machine/cpu-features.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/cpu-features.h
rename to ndk/platforms/android-3/arch-arm/include/machine/cpu-features.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/exec.h b/ndk/platforms/android-3/arch-arm/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/exec.h
rename to ndk/platforms/android-3/arch-arm/include/machine/exec.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/ieee.h b/ndk/platforms/android-3/arch-arm/include/machine/ieee.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/ieee.h
rename to ndk/platforms/android-3/arch-arm/include/machine/ieee.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/internal_types.h b/ndk/platforms/android-3/arch-arm/include/machine/internal_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/internal_types.h
rename to ndk/platforms/android-3/arch-arm/include/machine/internal_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/kernel.h b/ndk/platforms/android-3/arch-arm/include/machine/kernel.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/kernel.h
rename to ndk/platforms/android-3/arch-arm/include/machine/kernel.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/limits.h b/ndk/platforms/android-3/arch-arm/include/machine/limits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/limits.h
rename to ndk/platforms/android-3/arch-arm/include/machine/limits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/machine/setjmp.h b/ndk/platforms/android-3/arch-arm/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/machine/setjmp.h
rename to ndk/platforms/android-3/arch-arm/include/machine/setjmp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/crtbegin_dynamic.o b/ndk/platforms/android-3/arch-arm/lib/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/crtbegin_dynamic.o
rename to ndk/platforms/android-3/arch-arm/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/crtbegin_static.o b/ndk/platforms/android-3/arch-arm/lib/crtbegin_static.o
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/crtbegin_static.o
rename to ndk/platforms/android-3/arch-arm/lib/crtbegin_static.o
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/crtend_android.o b/ndk/platforms/android-3/arch-arm/lib/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/crtend_android.o
rename to ndk/platforms/android-3/arch-arm/lib/crtend_android.o
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libc.a b/ndk/platforms/android-3/arch-arm/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libc.a
rename to ndk/platforms/android-3/arch-arm/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libc.so b/ndk/platforms/android-3/arch-arm/lib/libc.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libc.so
rename to ndk/platforms/android-3/arch-arm/lib/libc.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libdl.so b/ndk/platforms/android-3/arch-arm/lib/libdl.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libdl.so
rename to ndk/platforms/android-3/arch-arm/lib/libdl.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/liblog.so b/ndk/platforms/android-3/arch-arm/lib/liblog.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/liblog.so
rename to ndk/platforms/android-3/arch-arm/lib/liblog.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libm.a b/ndk/platforms/android-3/arch-arm/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libm.a
rename to ndk/platforms/android-3/arch-arm/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libm.so b/ndk/platforms/android-3/arch-arm/lib/libm.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libm.so
rename to ndk/platforms/android-3/arch-arm/lib/libm.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libstdc++.a b/ndk/platforms/android-3/arch-arm/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libstdc++.a
rename to ndk/platforms/android-3/arch-arm/lib/libstdc++.a
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libstdc++.so b/ndk/platforms/android-3/arch-arm/lib/libstdc++.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libstdc++.so
rename to ndk/platforms/android-3/arch-arm/lib/libstdc++.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libthread_db.a b/ndk/platforms/android-3/arch-arm/lib/libthread_db.a
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libthread_db.a
rename to ndk/platforms/android-3/arch-arm/lib/libthread_db.a
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libthread_db.so b/ndk/platforms/android-3/arch-arm/lib/libthread_db.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libthread_db.so
rename to ndk/platforms/android-3/arch-arm/lib/libthread_db.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/lib/libz.so b/ndk/platforms/android-3/arch-arm/lib/libz.so
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/lib/libz.so
rename to ndk/platforms/android-3/arch-arm/lib/libz.so
Binary files differ
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/inttypes.h b/ndk/platforms/android-3/arch-arm/usr/include/inttypes.h
deleted file mode 100644
index ca303cb..0000000
--- a/ndk/platforms/android-3/arch-arm/usr/include/inttypes.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*	$OpenBSD: inttypes.h,v 1.9 2006/01/15 00:47:51 millert Exp $	*/
-
-/*
- * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef	_INTTYPES_H_
-#define	_INTTYPES_H_
-
-#include <stdint.h>
-#include <sys/cdefs.h>
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
-/*
- * 7.8.1 Macros for format specifiers
- *
- * Each of the following object-like macros expands to a string
- * literal containing a conversion specifier, possibly modified by
- * a prefix such as hh, h, l, or ll, suitable for use within the
- * format argument of a formatted input/output function when
- * converting the corresponding integer type.  These macro names
- * have the general form of PRI (character string literals for the
- * fprintf family) or SCN (character string literals for the fscanf
- * family), followed by the conversion specifier, followed by a
- * name corresponding to a similar typedef name.  For example,
- * PRIdFAST32 can be used in a format string to print the value of
- * an integer of type int_fast32_t.
- */
-
-/* fprintf macros for signed integers */
-#define	PRId8			"d"		/* int8_t */
-#define	PRId16			"d"		/* int16_t */
-#define	PRId32			"d"		/* int32_t */
-#define	PRId64			"lld"		/* int64_t */
-
-#define	PRIdLEAST8		"d"		/* int_least8_t */
-#define	PRIdLEAST16		"d"		/* int_least16_t */
-#define	PRIdLEAST32		"d"		/* int_least32_t */
-#define	PRIdLEAST64		"lld"		/* int_least64_t */
-
-#define	PRIdFAST8		"d"		/* int_fast8_t */
-#define	PRIdFAST16		"d"		/* int_fast16_t */
-#define	PRIdFAST32		"d"		/* int_fast32_t */
-#define	PRIdFAST64		"lld"		/* int_fast64_t */
-
-#define	PRIdMAX			"jd"		/* intmax_t */
-#define	PRIdPTR			"ld"		/* intptr_t */
-
-#define	PRIi8			"i"		/* int8_t */
-#define	PRIi16			"i"		/* int16_t */
-#define	PRIi32			"i"		/* int32_t */
-#define	PRIi64			"lli"		/* int64_t */
-
-#define	PRIiLEAST8		"i"		/* int_least8_t */
-#define	PRIiLEAST16		"i"		/* int_least16_t */
-#define	PRIiLEAST32		"i"		/* int_least32_t */
-#define	PRIiLEAST64		"lli"		/* int_least64_t */
-
-#define	PRIiFAST8		"i"		/* int_fast8_t */
-#define	PRIiFAST16		"i"		/* int_fast16_t */
-#define	PRIiFAST32		"i"		/* int_fast32_t */
-#define	PRIiFAST64		"lli"		/* int_fast64_t */
-
-#define	PRIiMAX			"ji"		/* intmax_t */
-#define	PRIiPTR			"li"		/* intptr_t */
-
-/* fprintf macros for unsigned integers */
-#define	PRIo8			"o"		/* int8_t */
-#define	PRIo16			"o"		/* int16_t */
-#define	PRIo32			"o"		/* int32_t */
-#define	PRIo64			"llo"		/* int64_t */
-
-#define	PRIoLEAST8		"o"		/* int_least8_t */
-#define	PRIoLEAST16		"o"		/* int_least16_t */
-#define	PRIoLEAST32		"o"		/* int_least32_t */
-#define	PRIoLEAST64		"llo"		/* int_least64_t */
-
-#define	PRIoFAST8		"o"		/* int_fast8_t */
-#define	PRIoFAST16		"o"		/* int_fast16_t */
-#define	PRIoFAST32		"o"		/* int_fast32_t */
-#define	PRIoFAST64		"llo"		/* int_fast64_t */
-
-#define	PRIoMAX			"jo"		/* intmax_t */
-#define	PRIoPTR			"lo"		/* intptr_t */
-
-#define	PRIu8			"u"		/* uint8_t */
-#define	PRIu16			"u"		/* uint16_t */
-#define	PRIu32			"u"		/* uint32_t */
-#define	PRIu64			"llu"		/* uint64_t */
-
-#define	PRIuLEAST8		"u"		/* uint_least8_t */
-#define	PRIuLEAST16		"u"		/* uint_least16_t */
-#define	PRIuLEAST32		"u"		/* uint_least32_t */
-#define	PRIuLEAST64		"llu"		/* uint_least64_t */
-
-#define	PRIuFAST8		"u"		/* uint_fast8_t */
-#define	PRIuFAST16		"u"		/* uint_fast16_t */
-#define	PRIuFAST32		"u"		/* uint_fast32_t */
-#define	PRIuFAST64		"llu"		/* uint_fast64_t */
-
-#define	PRIuMAX			"ju"		/* uintmax_t */
-#define	PRIuPTR			"lu"		/* uintptr_t */
-
-#define	PRIx8			"x"		/* uint8_t */
-#define	PRIx16			"x"		/* uint16_t */
-#define	PRIx32			"x"		/* uint32_t */
-#define	PRIx64			"llx"		/* uint64_t */
-
-#define	PRIxLEAST8		"x"		/* uint_least8_t */
-#define	PRIxLEAST16		"x"		/* uint_least16_t */
-#define	PRIxLEAST32		"x"		/* uint_least32_t */
-#define	PRIxLEAST64		"llx"		/* uint_least64_t */
-
-#define	PRIxFAST8		"x"		/* uint_fast8_t */
-#define	PRIxFAST16		"x"		/* uint_fast16_t */
-#define	PRIxFAST32		"x"		/* uint_fast32_t */
-#define	PRIxFAST64		"llx"		/* uint_fast64_t */
-
-#define	PRIxMAX			"jx"		/* uintmax_t */
-#define	PRIxPTR			"lx"		/* uintptr_t */
-
-#define	PRIX8			"X"		/* uint8_t */
-#define	PRIX16			"X"		/* uint16_t */
-#define	PRIX32			"X"		/* uint32_t */
-#define	PRIX64			"llX"		/* uint64_t */
-
-#define	PRIXLEAST8		"X"		/* uint_least8_t */
-#define	PRIXLEAST16		"X"		/* uint_least16_t */
-#define	PRIXLEAST32		"X"		/* uint_least32_t */
-#define	PRIXLEAST64		"llX"		/* uint_least64_t */
-
-#define	PRIXFAST8		"X"		/* uint_fast8_t */
-#define	PRIXFAST16		"X"		/* uint_fast16_t */
-#define	PRIXFAST32		"X"		/* uint_fast32_t */
-#define	PRIXFAST64		"llX"		/* uint_fast64_t */
-
-#define	PRIXMAX			"jX"		/* uintmax_t */
-#define	PRIXPTR			"lX"		/* uintptr_t */
-
-/* fscanf macros for signed integers */
-#define	SCNd8			"hhd"		/* int8_t */
-#define	SCNd16			"hd"		/* int16_t */
-#define	SCNd32			"d"		/* int32_t */
-#define	SCNd64			"lld"		/* int64_t */
-
-#define	SCNdLEAST8		"hhd"		/* int_least8_t */
-#define	SCNdLEAST16		"hd"		/* int_least16_t */
-#define	SCNdLEAST32		"d"		/* int_least32_t */
-#define	SCNdLEAST64		"lld"		/* int_least64_t */
-
-#define	SCNdFAST8		"hhd"		/* int_fast8_t */
-#define	SCNdFAST16		"hd"		/* int_fast16_t */
-#define	SCNdFAST32		"d"		/* int_fast32_t */
-#define	SCNdFAST64		"lld"		/* int_fast64_t */
-
-#define	SCNdMAX			"jd"		/* intmax_t */
-#define	SCNdPTR			"ld"		/* intptr_t */
-
-#define	SCNi8			"hhi"		/* int8_t */
-#define	SCNi16			"hi"		/* int16_t */
-#define	SCNi32			"i"		/* int32_t */
-#define	SCNi64			"lli"		/* int64_t */
-
-#define	SCNiLEAST8		"hhi"		/* int_least8_t */
-#define	SCNiLEAST16		"hi"		/* int_least16_t */
-#define	SCNiLEAST32		"i"		/* int_least32_t */
-#define	SCNiLEAST64		"lli"		/* int_least64_t */
-
-#define	SCNiFAST8		"hhi"		/* int_fast8_t */
-#define	SCNiFAST16		"hi"		/* int_fast16_t */
-#define	SCNiFAST32		"i"		/* int_fast32_t */
-#define	SCNiFAST64		"lli"		/* int_fast64_t */
-
-#define	SCNiMAX			"ji"		/* intmax_t */
-#define	SCNiPTR			"li"		/* intptr_t */
-
-/* fscanf macros for unsigned integers */
-#define	SCNo8			"hho"		/* uint8_t */
-#define	SCNo16			"ho"		/* uint16_t */
-#define	SCNo32			"o"		/* uint32_t */
-#define	SCNo64			"llo"		/* uint64_t */
-
-#define	SCNoLEAST8		"hho"		/* uint_least8_t */
-#define	SCNoLEAST16		"ho"		/* uint_least16_t */
-#define	SCNoLEAST32		"o"		/* uint_least32_t */
-#define	SCNoLEAST64		"llo"		/* uint_least64_t */
-
-#define	SCNoFAST8		"hho"		/* uint_fast8_t */
-#define	SCNoFAST16		"ho"		/* uint_fast16_t */
-#define	SCNoFAST32		"o"		/* uint_fast32_t */
-#define	SCNoFAST64		"llo"		/* uint_fast64_t */
-
-#define	SCNoMAX			"jo"		/* uintmax_t */
-#define	SCNoPTR			"lo"		/* uintptr_t */
-
-#define	SCNu8			"hhu"		/* uint8_t */
-#define	SCNu16			"hu"		/* uint16_t */
-#define	SCNu32			"u"		/* uint32_t */
-#define	SCNu64			"llu"		/* uint64_t */
-
-#define	SCNuLEAST8		"hhu"		/* uint_least8_t */
-#define	SCNuLEAST16		"hu"		/* uint_least16_t */
-#define	SCNuLEAST32		"u"		/* uint_least32_t */
-#define	SCNuLEAST64		"llu"		/* uint_least64_t */
-
-#define	SCNuFAST8		"hhu"		/* uint_fast8_t */
-#define	SCNuFAST16		"hu"		/* uint_fast16_t */
-#define	SCNuFAST32		"u"		/* uint_fast32_t */
-#define	SCNuFAST64		"llu"		/* uint_fast64_t */
-
-#define	SCNuMAX			"ju"		/* uintmax_t */
-#define	SCNuPTR			"lu"		/* uintptr_t */
-
-#define	SCNx8			"hhx"		/* uint8_t */
-#define	SCNx16			"hx"		/* uint16_t */
-#define	SCNx32			"x"		/* uint32_t */
-#define	SCNx64			"llx"		/* uint64_t */
-
-#define	SCNxLEAST8		"hhx"		/* uint_least8_t */
-#define	SCNxLEAST16		"hx"		/* uint_least16_t */
-#define	SCNxLEAST32		"x"		/* uint_least32_t */
-#define	SCNxLEAST64		"llx"		/* uint_least64_t */
-
-#define	SCNxFAST8		"hhx"		/* uint_fast8_t */
-#define	SCNxFAST16		"hx"		/* uint_fast16_t */
-#define	SCNxFAST32		"x"		/* uint_fast32_t */
-#define	SCNxFAST64		"llx"		/* uint_fast64_t */
-
-#define	SCNxMAX			"jx"		/* uintmax_t */
-#define	SCNxPTR			"lx"		/* uintptr_t */
-
-#endif /* __cplusplus || __STDC_FORMAT_MACROS */
-
-typedef struct {
-	intmax_t quot;		/* quotient */
-	intmax_t rem;		/* remainder */
-} imaxdiv_t;
-
-__BEGIN_DECLS
-intmax_t	imaxabs(intmax_t);
-imaxdiv_t	imaxdiv(intmax_t, intmax_t);
-intmax_t	strtoimax(const char *, char **, int);
-uintmax_t	strtoumax(const char *, char **, int);
-__END_DECLS
-
-#endif /* _INTTYPES_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sched.h b/ndk/platforms/android-3/arch-arm/usr/include/sched.h
deleted file mode 100644
index 6600bae..0000000
--- a/ndk/platforms/android-3/arch-arm/usr/include/sched.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _SCHED_H_
-#define _SCHED_H_
-
-#include <sys/cdefs.h>
-#include <sys/time.h>
-
-__BEGIN_DECLS
-
-#define SCHED_NORMAL            0
-#define SCHED_OTHER             0
-#define SCHED_FIFO              1
-#define SCHED_RR                2
-
-struct sched_param {
-    int sched_priority;
-};
-
-extern int sched_setscheduler(pid_t, int, const struct sched_param *);
-extern int sched_getscheduler(pid_t);
-extern int sched_yield(void);
-extern int sched_get_priority_max(int policy);
-extern int sched_get_priority_min(int policy);
-extern int sched_setparam(pid_t, const struct sched_param *);
-extern int sched_getparam(pid_t, struct sched_param *);
-extern int sched_rr_get_interval(pid_t pid, struct timespec *tp);
-
-#define CLONE_VM             0x00000100
-#define CLONE_FS             0x00000200
-#define CLONE_FILES          0x00000400
-#define CLONE_SIGHAND        0x00000800
-#define CLONE_PTRACE         0x00002000
-#define CLONE_VFORK          0x00004000
-#define CLONE_PARENT         0x00008000
-#define CLONE_THREAD         0x00010000
-#define CLONE_NEWNS          0x00020000
-#define CLONE_SYSVSEM        0x00040000
-#define CLONE_SETTLS         0x00080000
-#define CLONE_PARENT_SETTID  0x00100000
-#define CLONE_CHILD_CLEARTID 0x00200000
-#define CLONE_DETACHED       0x00400000
-#define CLONE_UNTRACED       0x00800000
-#define CLONE_CHILD_SETTID   0x01000000
-#define CLONE_STOPPED        0x02000000
-
-extern int    clone(int (*fn)(void*), void *child_stack, int flags, void *arg);
-extern pid_t  __clone(int, void *);
-
-__END_DECLS
-
-#endif /* _SCHED_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/select.h b/ndk/platforms/android-3/arch-arm/usr/include/sys/select.h
deleted file mode 100644
index 52315b9..0000000
--- a/ndk/platforms/android-3/arch-arm/usr/include/sys/select.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _SYS_SELECT_H_
-#define _SYS_SELECT_H_
-
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-typedef __kernel_fd_set   fd_set;
-
-extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-
-__END_DECLS
-
-#endif /* _SYS_SELECT_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/unistd.h b/ndk/platforms/android-3/arch-arm/usr/include/unistd.h
deleted file mode 100644
index 1ada37e..0000000
--- a/ndk/platforms/android-3/arch-arm/usr/include/unistd.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _UNISTD_H_
-#define _UNISTD_H_
-
-#include <stddef.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include <sys/sysconf.h>
-#include <linux/capability.h>
-#include <pathconf.h>
-
-__BEGIN_DECLS
-
-/* Standard file descriptor numbers. */
-#define STDIN_FILENO	0
-#define STDOUT_FILENO	1
-#define STDERR_FILENO	2
-
-/* Values for whence in fseek and lseek */
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-
-extern char **environ;
-extern __noreturn void _exit(int);
-
-extern pid_t  fork(void);
-extern pid_t  vfork(void);
-extern pid_t  getpid(void);
-extern pid_t  gettid(void);
-extern pid_t  getpgid(pid_t);
-extern int    setpgid(pid_t, pid_t);
-extern pid_t  getppid(void);
-extern pid_t  getpgrp(void);
-extern int    setpgrp(void);
-extern pid_t  setsid(void);
-extern pid_t  getsid(pid_t);
-
-extern int execv(const char *, char * const *);
-extern int execvp(const char *, char * const *);
-extern int execve(const char *, char * const *, char * const *);
-extern int execvpe(const char *, char * const *, char * const *);
-extern int execl(const char *, const char *, ...);
-extern int execlp(const char *, const char *, ...);
-extern int execle(const char *, const char *, ...);
-extern int execlpe(const char *, const char *, ...);
-extern int capget(cap_user_header_t hdrp, cap_user_data_t datap);
-extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
-extern int prctl(int  option,  unsigned long arg2, unsigned long arg3,
-                 unsigned long arg4, unsigned long arg5);
-
-extern int nice(int);
-
-extern int setuid(uid_t);
-extern uid_t getuid(void);
-extern int seteuid(uid_t);
-extern uid_t geteuid(void);
-extern int setgid(gid_t);
-extern gid_t getgid(void);
-extern int setegid(gid_t);
-extern gid_t getegid(void);
-extern int getgroups(int, gid_t *);
-extern int setgroups(size_t, const gid_t *);
-extern int setreuid(uid_t, uid_t);
-extern int setregid(gid_t, gid_t);
-extern int setresuid(uid_t, uid_t, uid_t);
-extern int setresgid(gid_t, gid_t, gid_t);
-extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
-extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
-extern int getfsuid(uid_t);
-extern int setfsuid(uid_t);
-extern int issetugid(void);
-extern char* getlogin(void);
-extern int getlogin_r(char* name, size_t namesize);
-
-
-/* Macros for access() */
-#define R_OK  4  /* Read */
-#define W_OK  2  /* Write */
-#define X_OK  1  /* Execute */
-#define F_OK  0  /* Existence */
-
-extern int access(const char *, int);
-extern int link(const char *, const char *);
-extern int unlink(const char *);
-extern int chdir(const char *);
-extern int fchdir(int);
-extern int rmdir(const char *);
-extern int pipe(int *);
-extern int chroot(const char *);
-extern int symlink(const char *, const char *);
-extern int readlink(const char *, char *, size_t);
-extern int chown(const char *, uid_t, gid_t);
-extern int fchown(int, uid_t, gid_t);
-extern int lchown(const char *, uid_t, gid_t);
-extern char *getcwd(char *, size_t);
-
-extern int sync(void);
-
-extern int close(int);
-extern off_t lseek(int, off_t, int);
-extern loff_t lseek64(int, loff_t, int);
-
-extern ssize_t read(int, void *, size_t);
-extern ssize_t write(int, const void *, size_t);
-extern ssize_t pread(int, void *, size_t, off_t);
-extern ssize_t pwrite(int, void *, size_t, off_t);
-
-extern int dup(int);
-extern int dup2(int, int);
-extern int fcntl(int, int, ...);
-extern int ioctl(int, int, ...);
-extern int flock(int, int);
-extern int fsync(int);
-extern int fdatasync(int);
-extern int ftruncate(int, off_t);
-
-extern int pause(void);
-extern unsigned int alarm(unsigned int);
-extern unsigned int sleep(unsigned int);
-extern void usleep(unsigned long);
-
-extern int gethostname(char *, size_t);
-extern int sethostname(const char *, size_t);
-extern int getdomainname(char *, size_t);
-extern int setdomainname(const char *, size_t);
-
-extern int getdtablesize(void);
-
-extern void *__brk(void *);
-extern int brk(void *);
-extern void *sbrk(ptrdiff_t);
-
-extern int getopt(int, char * const *, const char *);
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-extern int isatty(int);
-
-extern int  acct(const char*  filepath);
-
-static __inline__ int getpagesize(void) {
-  extern unsigned int __page_size;
-  return __page_size;
-}
-static __inline__ int __getpageshift(void) {
-  extern unsigned int __page_shift;
-  return __page_shift;
-}
-
-extern int sysconf(int  name);
-
-extern int daemon(int, int);
-
-/* A special syscall that is only available on the ARM, not x86 function. */
-extern int cacheflush(long start, long end, long flags);
-
-extern pid_t tcgetpgrp(int fd);
-extern int   tcsetpgrp(int fd, pid_t _pid);
-
-__END_DECLS
-
-#endif /* _UNISTD_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/alloca.h b/ndk/platforms/android-3/include/alloca.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/alloca.h
rename to ndk/platforms/android-3/include/alloca.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/android/log.h b/ndk/platforms/android-3/include/android/log.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/android/log.h
rename to ndk/platforms/android-3/include/android/log.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/arpa/inet.h b/ndk/platforms/android-3/include/arpa/inet.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/arpa/inet.h
rename to ndk/platforms/android-3/include/arpa/inet.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/arpa/nameser.h b/ndk/platforms/android-3/include/arpa/nameser.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/arpa/nameser.h
rename to ndk/platforms/android-3/include/arpa/nameser.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h b/ndk/platforms/android-3/include/asm-generic/4level-fixup.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/4level-fixup.h
rename to ndk/platforms/android-3/include/asm-generic/4level-fixup.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h b/ndk/platforms/android-3/include/asm-generic/audit_dir_write.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/audit_dir_write.h
rename to ndk/platforms/android-3/include/asm-generic/audit_dir_write.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h b/ndk/platforms/android-3/include/asm-generic/bitops/__ffs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/__ffs.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/__ffs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h b/ndk/platforms/android-3/include/asm-generic/bitops/atomic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/atomic.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/atomic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h b/ndk/platforms/android-3/include/asm-generic/bitops/ffz.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/ffz.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/ffz.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h b/ndk/platforms/android-3/include/asm-generic/bitops/find.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/find.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/find.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h b/ndk/platforms/android-3/include/asm-generic/bitops/fls.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/fls.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h b/ndk/platforms/android-3/include/asm-generic/bitops/fls64.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/fls64.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/fls64.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h b/ndk/platforms/android-3/include/asm-generic/bitops/le.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/le.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/le.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h b/ndk/platforms/android-3/include/asm-generic/bitops/non-atomic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bitops/non-atomic.h
rename to ndk/platforms/android-3/include/asm-generic/bitops/non-atomic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h b/ndk/platforms/android-3/include/asm-generic/bug.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/bug.h
rename to ndk/platforms/android-3/include/asm-generic/bug.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h b/ndk/platforms/android-3/include/asm-generic/cputime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/cputime.h
rename to ndk/platforms/android-3/include/asm-generic/cputime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h b/ndk/platforms/android-3/include/asm-generic/emergency-restart.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/emergency-restart.h
rename to ndk/platforms/android-3/include/asm-generic/emergency-restart.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h b/ndk/platforms/android-3/include/asm-generic/errno-base.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/errno-base.h
rename to ndk/platforms/android-3/include/asm-generic/errno-base.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h b/ndk/platforms/android-3/include/asm-generic/errno.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/errno.h
rename to ndk/platforms/android-3/include/asm-generic/errno.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h b/ndk/platforms/android-3/include/asm-generic/fcntl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/fcntl.h
rename to ndk/platforms/android-3/include/asm-generic/fcntl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h b/ndk/platforms/android-3/include/asm-generic/futex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/futex.h
rename to ndk/platforms/android-3/include/asm-generic/futex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h b/ndk/platforms/android-3/include/asm-generic/ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/ioctl.h
rename to ndk/platforms/android-3/include/asm-generic/ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h b/ndk/platforms/android-3/include/asm-generic/ipc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/ipc.h
rename to ndk/platforms/android-3/include/asm-generic/ipc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/local.h b/ndk/platforms/android-3/include/asm-generic/local.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/local.h
rename to ndk/platforms/android-3/include/asm-generic/local.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h b/ndk/platforms/android-3/include/asm-generic/memory_model.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/memory_model.h
rename to ndk/platforms/android-3/include/asm-generic/memory_model.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h b/ndk/platforms/android-3/include/asm-generic/mman.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/mman.h
rename to ndk/platforms/android-3/include/asm-generic/mman.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h b/ndk/platforms/android-3/include/asm-generic/mutex-xchg.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/mutex-xchg.h
rename to ndk/platforms/android-3/include/asm-generic/mutex-xchg.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h b/ndk/platforms/android-3/include/asm-generic/percpu.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/percpu.h
rename to ndk/platforms/android-3/include/asm-generic/percpu.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h b/ndk/platforms/android-3/include/asm-generic/pgtable-nopud.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable-nopud.h
rename to ndk/platforms/android-3/include/asm-generic/pgtable-nopud.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h b/ndk/platforms/android-3/include/asm-generic/pgtable.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/pgtable.h
rename to ndk/platforms/android-3/include/asm-generic/pgtable.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h b/ndk/platforms/android-3/include/asm-generic/poll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/poll.h
rename to ndk/platforms/android-3/include/asm-generic/poll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h b/ndk/platforms/android-3/include/asm-generic/resource.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/resource.h
rename to ndk/platforms/android-3/include/asm-generic/resource.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h b/ndk/platforms/android-3/include/asm-generic/sections.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/sections.h
rename to ndk/platforms/android-3/include/asm-generic/sections.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h b/ndk/platforms/android-3/include/asm-generic/siginfo.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/siginfo.h
rename to ndk/platforms/android-3/include/asm-generic/siginfo.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h b/ndk/platforms/android-3/include/asm-generic/signal.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/signal.h
rename to ndk/platforms/android-3/include/asm-generic/signal.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h b/ndk/platforms/android-3/include/asm-generic/tlb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/tlb.h
rename to ndk/platforms/android-3/include/asm-generic/tlb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h b/ndk/platforms/android-3/include/asm-generic/topology.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/topology.h
rename to ndk/platforms/android-3/include/asm-generic/topology.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h b/ndk/platforms/android-3/include/asm-generic/xor.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/asm-generic/xor.h
rename to ndk/platforms/android-3/include/asm-generic/xor.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/assert.h b/ndk/platforms/android-3/include/assert.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/assert.h
rename to ndk/platforms/android-3/include/assert.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/byteswap.h b/ndk/platforms/android-3/include/byteswap.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/byteswap.h
rename to ndk/platforms/android-3/include/byteswap.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/ctype.h b/ndk/platforms/android-3/include/ctype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/ctype.h
rename to ndk/platforms/android-3/include/ctype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/dirent.h b/ndk/platforms/android-3/include/dirent.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/dirent.h
rename to ndk/platforms/android-3/include/dirent.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/dlfcn.h b/ndk/platforms/android-3/include/dlfcn.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/dlfcn.h
rename to ndk/platforms/android-3/include/dlfcn.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/elf.h b/ndk/platforms/android-3/include/elf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/elf.h
rename to ndk/platforms/android-3/include/elf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/endian.h b/ndk/platforms/android-3/include/endian.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/endian.h
rename to ndk/platforms/android-3/include/endian.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/err.h b/ndk/platforms/android-3/include/err.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/err.h
rename to ndk/platforms/android-3/include/err.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/errno.h b/ndk/platforms/android-3/include/errno.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/errno.h
rename to ndk/platforms/android-3/include/errno.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/fcntl.h b/ndk/platforms/android-3/include/fcntl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/fcntl.h
rename to ndk/platforms/android-3/include/fcntl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/features.h b/ndk/platforms/android-3/include/features.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/features.h
rename to ndk/platforms/android-3/include/features.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/fnmatch.h b/ndk/platforms/android-3/include/fnmatch.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/fnmatch.h
rename to ndk/platforms/android-3/include/fnmatch.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/getopt.h b/ndk/platforms/android-3/include/getopt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/getopt.h
rename to ndk/platforms/android-3/include/getopt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/grp.h b/ndk/platforms/android-3/include/grp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/grp.h
rename to ndk/platforms/android-3/include/grp.h
diff --git a/ndk/platforms/android-3/include/inttypes.h b/ndk/platforms/android-3/include/inttypes.h
new file mode 100644
index 0000000..81d2315
--- /dev/null
+++ b/ndk/platforms/android-3/include/inttypes.h
@@ -0,0 +1,261 @@
+/*	$OpenBSD: inttypes.h,v 1.9 2006/01/15 00:47:51 millert Exp $	*/
+
+/*
+ * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef	_INTTYPES_H_
+#define	_INTTYPES_H_
+
+#include <stdint.h>
+#include <sys/cdefs.h>
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
+/*
+ * 7.8.1 Macros for format specifiers
+ *
+ * Each of the following object-like macros expands to a string
+ * literal containing a conversion specifier, possibly modified by
+ * a prefix such as hh, h, l, or ll, suitable for use within the
+ * format argument of a formatted input/output function when
+ * converting the corresponding integer type.  These macro names
+ * have the general form of PRI (character string literals for the
+ * fprintf family) or SCN (character string literals for the fscanf
+ * family), followed by the conversion specifier, followed by a
+ * name corresponding to a similar typedef name.  For example,
+ * PRIdFAST32 can be used in a format string to print the value of
+ * an integer of type int_fast32_t.
+ */
+
+/* fprintf macros for signed integers */
+#define	PRId8			"d"		/* int8_t */
+#define	PRId16			"d"		/* int16_t */
+#define	PRId32			"d"		/* int32_t */
+#define	PRId64			"lld"		/* int64_t */
+
+#define	PRIdLEAST8		"d"		/* int_least8_t */
+#define	PRIdLEAST16		"d"		/* int_least16_t */
+#define	PRIdLEAST32		"d"		/* int_least32_t */
+#define	PRIdLEAST64		"lld"		/* int_least64_t */
+
+#define	PRIdFAST8		"d"		/* int_fast8_t */
+#define	PRIdFAST16		"d"		/* int_fast16_t */
+#define	PRIdFAST32		"d"		/* int_fast32_t */
+#define	PRIdFAST64		"lld"		/* int_fast64_t */
+
+#define	PRIdMAX			"jd"		/* intmax_t */
+#define	PRIdPTR			"ld"		/* intptr_t */
+
+#define	PRIi8			"i"		/* int8_t */
+#define	PRIi16			"i"		/* int16_t */
+#define	PRIi32			"i"		/* int32_t */
+#define	PRIi64			"lli"		/* int64_t */
+
+#define	PRIiLEAST8		"i"		/* int_least8_t */
+#define	PRIiLEAST16		"i"		/* int_least16_t */
+#define	PRIiLEAST32		"i"		/* int_least32_t */
+#define	PRIiLEAST64		"lli"		/* int_least64_t */
+
+#define	PRIiFAST8		"i"		/* int_fast8_t */
+#define	PRIiFAST16		"i"		/* int_fast16_t */
+#define	PRIiFAST32		"i"		/* int_fast32_t */
+#define	PRIiFAST64		"lli"		/* int_fast64_t */
+
+#define	PRIiMAX			"ji"		/* intmax_t */
+#define	PRIiPTR			"li"		/* intptr_t */
+
+/* fprintf macros for unsigned integers */
+#define	PRIo8			"o"		/* int8_t */
+#define	PRIo16			"o"		/* int16_t */
+#define	PRIo32			"o"		/* int32_t */
+#define	PRIo64			"llo"		/* int64_t */
+
+#define	PRIoLEAST8		"o"		/* int_least8_t */
+#define	PRIoLEAST16		"o"		/* int_least16_t */
+#define	PRIoLEAST32		"o"		/* int_least32_t */
+#define	PRIoLEAST64		"llo"		/* int_least64_t */
+
+#define	PRIoFAST8		"o"		/* int_fast8_t */
+#define	PRIoFAST16		"o"		/* int_fast16_t */
+#define	PRIoFAST32		"o"		/* int_fast32_t */
+#define	PRIoFAST64		"llo"		/* int_fast64_t */
+
+#define	PRIoMAX			"jo"		/* intmax_t */
+#define	PRIoPTR			"lo"		/* intptr_t */
+
+#define	PRIu8			"u"		/* uint8_t */
+#define	PRIu16			"u"		/* uint16_t */
+#define	PRIu32			"u"		/* uint32_t */
+#define	PRIu64			"llu"		/* uint64_t */
+
+#define	PRIuLEAST8		"u"		/* uint_least8_t */
+#define	PRIuLEAST16		"u"		/* uint_least16_t */
+#define	PRIuLEAST32		"u"		/* uint_least32_t */
+#define	PRIuLEAST64		"llu"		/* uint_least64_t */
+
+#define	PRIuFAST8		"u"		/* uint_fast8_t */
+#define	PRIuFAST16		"u"		/* uint_fast16_t */
+#define	PRIuFAST32		"u"		/* uint_fast32_t */
+#define	PRIuFAST64		"llu"		/* uint_fast64_t */
+
+#define	PRIuMAX			"ju"		/* uintmax_t */
+#define	PRIuPTR			"lu"		/* uintptr_t */
+
+#define	PRIx8			"x"		/* uint8_t */
+#define	PRIx16			"x"		/* uint16_t */
+#define	PRIx32			"x"		/* uint32_t */
+#define	PRIx64			"llx"		/* uint64_t */
+
+#define	PRIxLEAST8		"x"		/* uint_least8_t */
+#define	PRIxLEAST16		"x"		/* uint_least16_t */
+#define	PRIxLEAST32		"x"		/* uint_least32_t */
+#define	PRIxLEAST64		"llx"		/* uint_least64_t */
+
+#define	PRIxFAST8		"x"		/* uint_fast8_t */
+#define	PRIxFAST16		"x"		/* uint_fast16_t */
+#define	PRIxFAST32		"x"		/* uint_fast32_t */
+#define	PRIxFAST64		"llx"		/* uint_fast64_t */
+
+#define	PRIxMAX			"jx"		/* uintmax_t */
+#define	PRIxPTR			"lx"		/* uintptr_t */
+
+#define	PRIX8			"X"		/* uint8_t */
+#define	PRIX16			"X"		/* uint16_t */
+#define	PRIX32			"X"		/* uint32_t */
+#define	PRIX64			"llX"		/* uint64_t */
+
+#define	PRIXLEAST8		"X"		/* uint_least8_t */
+#define	PRIXLEAST16		"X"		/* uint_least16_t */
+#define	PRIXLEAST32		"X"		/* uint_least32_t */
+#define	PRIXLEAST64		"llX"		/* uint_least64_t */
+
+#define	PRIXFAST8		"X"		/* uint_fast8_t */
+#define	PRIXFAST16		"X"		/* uint_fast16_t */
+#define	PRIXFAST32		"X"		/* uint_fast32_t */
+#define	PRIXFAST64		"llX"		/* uint_fast64_t */
+
+#define	PRIXMAX			"jX"		/* uintmax_t */
+#define	PRIXPTR			"lX"		/* uintptr_t */
+
+/* fscanf macros for signed integers */
+#define	SCNd8			"hhd"		/* int8_t */
+#define	SCNd16			"hd"		/* int16_t */
+#define	SCNd32			"d"		/* int32_t */
+#define	SCNd64			"lld"		/* int64_t */
+
+#define	SCNdLEAST8		"hhd"		/* int_least8_t */
+#define	SCNdLEAST16		"hd"		/* int_least16_t */
+#define	SCNdLEAST32		"d"		/* int_least32_t */
+#define	SCNdLEAST64		"lld"		/* int_least64_t */
+
+#define	SCNdFAST8		"hhd"		/* int_fast8_t */
+#define	SCNdFAST16		"hd"		/* int_fast16_t */
+#define	SCNdFAST32		"d"		/* int_fast32_t */
+#define	SCNdFAST64		"lld"		/* int_fast64_t */
+
+#define	SCNdMAX			"jd"		/* intmax_t */
+#define	SCNdPTR			"ld"		/* intptr_t */
+
+#define	SCNi8			"hhi"		/* int8_t */
+#define	SCNi16			"hi"		/* int16_t */
+#define	SCNi32			"i"		/* int32_t */
+#define	SCNi64			"lli"		/* int64_t */
+
+#define	SCNiLEAST8		"hhi"		/* int_least8_t */
+#define	SCNiLEAST16		"hi"		/* int_least16_t */
+#define	SCNiLEAST32		"i"		/* int_least32_t */
+#define	SCNiLEAST64		"lli"		/* int_least64_t */
+
+#define	SCNiFAST8		"hhi"		/* int_fast8_t */
+#define	SCNiFAST16		"hi"		/* int_fast16_t */
+#define	SCNiFAST32		"i"		/* int_fast32_t */
+#define	SCNiFAST64		"lli"		/* int_fast64_t */
+
+#define	SCNiMAX			"ji"		/* intmax_t */
+#define	SCNiPTR			"li"		/* intptr_t */
+
+/* fscanf macros for unsigned integers */
+#define	SCNo8			"hho"		/* uint8_t */
+#define	SCNo16			"ho"		/* uint16_t */
+#define	SCNo32			"o"		/* uint32_t */
+#define	SCNo64			"llo"		/* uint64_t */
+
+#define	SCNoLEAST8		"hho"		/* uint_least8_t */
+#define	SCNoLEAST16		"ho"		/* uint_least16_t */
+#define	SCNoLEAST32		"o"		/* uint_least32_t */
+#define	SCNoLEAST64		"llo"		/* uint_least64_t */
+
+#define	SCNoFAST8		"hho"		/* uint_fast8_t */
+#define	SCNoFAST16		"ho"		/* uint_fast16_t */
+#define	SCNoFAST32		"o"		/* uint_fast32_t */
+#define	SCNoFAST64		"llo"		/* uint_fast64_t */
+
+#define	SCNoMAX			"jo"		/* uintmax_t */
+#define	SCNoPTR			"lo"		/* uintptr_t */
+
+#define	SCNu8			"hhu"		/* uint8_t */
+#define	SCNu16			"hu"		/* uint16_t */
+#define	SCNu32			"u"		/* uint32_t */
+#define	SCNu64			"llu"		/* uint64_t */
+
+#define	SCNuLEAST8		"hhu"		/* uint_least8_t */
+#define	SCNuLEAST16		"hu"		/* uint_least16_t */
+#define	SCNuLEAST32		"u"		/* uint_least32_t */
+#define	SCNuLEAST64		"llu"		/* uint_least64_t */
+
+#define	SCNuFAST8		"hhu"		/* uint_fast8_t */
+#define	SCNuFAST16		"hu"		/* uint_fast16_t */
+#define	SCNuFAST32		"u"		/* uint_fast32_t */
+#define	SCNuFAST64		"llu"		/* uint_fast64_t */
+
+#define	SCNuMAX			"ju"		/* uintmax_t */
+#define	SCNuPTR			"lu"		/* uintptr_t */
+
+#define	SCNx8			"hhx"		/* uint8_t */
+#define	SCNx16			"hx"		/* uint16_t */
+#define	SCNx32			"x"		/* uint32_t */
+#define	SCNx64			"llx"		/* uint64_t */
+
+#define	SCNxLEAST8		"hhx"		/* uint_least8_t */
+#define	SCNxLEAST16		"hx"		/* uint_least16_t */
+#define	SCNxLEAST32		"x"		/* uint_least32_t */
+#define	SCNxLEAST64		"llx"		/* uint_least64_t */
+
+#define	SCNxFAST8		"hhx"		/* uint_fast8_t */
+#define	SCNxFAST16		"hx"		/* uint_fast16_t */
+#define	SCNxFAST32		"x"		/* uint_fast32_t */
+#define	SCNxFAST64		"llx"		/* uint_fast64_t */
+
+#define	SCNxMAX			"jx"		/* uintmax_t */
+#define	SCNxPTR			"lx"		/* uintptr_t */
+
+#endif /* __cplusplus || __STDC_FORMAT_MACROS */
+
+typedef struct {
+	intmax_t quot;		/* quotient */
+	intmax_t rem;		/* remainder */
+} imaxdiv_t;
+
+__BEGIN_DECLS
+intmax_t	imaxabs(intmax_t);
+imaxdiv_t	imaxdiv(intmax_t, intmax_t);
+intmax_t	strtoimax(const char *, char **, int);
+uintmax_t	strtoumax(const char *, char **, int);
+
+intmax_t	strntoimax(const char *nptr, char **endptr, int base, size_t n);
+uintmax_t	strntoumax(const char *nptr, char **endptr, int base, size_t n);
+__END_DECLS
+
+#endif /* _INTTYPES_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/jni.h b/ndk/platforms/android-3/include/jni.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/jni.h
rename to ndk/platforms/android-3/include/jni.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/lastlog.h b/ndk/platforms/android-3/include/lastlog.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/lastlog.h
rename to ndk/platforms/android-3/include/lastlog.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/libgen.h b/ndk/platforms/android-3/include/libgen.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/libgen.h
rename to ndk/platforms/android-3/include/libgen.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/limits.h b/ndk/platforms/android-3/include/limits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/limits.h
rename to ndk/platforms/android-3/include/limits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/a.out.h b/ndk/platforms/android-3/include/linux/a.out.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/a.out.h
rename to ndk/platforms/android-3/include/linux/a.out.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/aio_abi.h b/ndk/platforms/android-3/include/linux/aio_abi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/aio_abi.h
rename to ndk/platforms/android-3/include/linux/aio_abi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/akm8976.h b/ndk/platforms/android-3/include/linux/akm8976.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/akm8976.h
rename to ndk/platforms/android-3/include/linux/akm8976.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/android_alarm.h b/ndk/platforms/android-3/include/linux/android_alarm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/android_alarm.h
rename to ndk/platforms/android-3/include/linux/android_alarm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/android_pmem.h b/ndk/platforms/android-3/include/linux/android_pmem.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/android_pmem.h
rename to ndk/platforms/android-3/include/linux/android_pmem.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/android_power.h b/ndk/platforms/android-3/include/linux/android_power.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/android_power.h
rename to ndk/platforms/android-3/include/linux/android_power.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/apm_bios.h b/ndk/platforms/android-3/include/linux/apm_bios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/apm_bios.h
rename to ndk/platforms/android-3/include/linux/apm_bios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ashmem.h b/ndk/platforms/android-3/include/linux/ashmem.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ashmem.h
rename to ndk/platforms/android-3/include/linux/ashmem.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ata.h b/ndk/platforms/android-3/include/linux/ata.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ata.h
rename to ndk/platforms/android-3/include/linux/ata.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atm.h b/ndk/platforms/android-3/include/linux/atm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atm.h
rename to ndk/platforms/android-3/include/linux/atm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atmapi.h b/ndk/platforms/android-3/include/linux/atmapi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atmapi.h
rename to ndk/platforms/android-3/include/linux/atmapi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atmdev.h b/ndk/platforms/android-3/include/linux/atmdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atmdev.h
rename to ndk/platforms/android-3/include/linux/atmdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atmioc.h b/ndk/platforms/android-3/include/linux/atmioc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atmioc.h
rename to ndk/platforms/android-3/include/linux/atmioc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atmppp.h b/ndk/platforms/android-3/include/linux/atmppp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atmppp.h
rename to ndk/platforms/android-3/include/linux/atmppp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/atmsap.h b/ndk/platforms/android-3/include/linux/atmsap.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/atmsap.h
rename to ndk/platforms/android-3/include/linux/atmsap.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/attribute_container.h b/ndk/platforms/android-3/include/linux/attribute_container.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/attribute_container.h
rename to ndk/platforms/android-3/include/linux/attribute_container.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/auto_fs.h b/ndk/platforms/android-3/include/linux/auto_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/auto_fs.h
rename to ndk/platforms/android-3/include/linux/auto_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/autoconf.h b/ndk/platforms/android-3/include/linux/autoconf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/autoconf.h
rename to ndk/platforms/android-3/include/linux/autoconf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/auxvec.h b/ndk/platforms/android-3/include/linux/auxvec.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/auxvec.h
rename to ndk/platforms/android-3/include/linux/auxvec.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/backing-dev.h b/ndk/platforms/android-3/include/linux/backing-dev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/backing-dev.h
rename to ndk/platforms/android-3/include/linux/backing-dev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/binder.h b/ndk/platforms/android-3/include/linux/binder.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/binder.h
rename to ndk/platforms/android-3/include/linux/binder.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/binfmts.h b/ndk/platforms/android-3/include/linux/binfmts.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/binfmts.h
rename to ndk/platforms/android-3/include/linux/binfmts.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/bio.h b/ndk/platforms/android-3/include/linux/bio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/bio.h
rename to ndk/platforms/android-3/include/linux/bio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/bitmap.h b/ndk/platforms/android-3/include/linux/bitmap.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/bitmap.h
rename to ndk/platforms/android-3/include/linux/bitmap.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/bitops.h b/ndk/platforms/android-3/include/linux/bitops.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/bitops.h
rename to ndk/platforms/android-3/include/linux/bitops.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/blkdev.h b/ndk/platforms/android-3/include/linux/blkdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/blkdev.h
rename to ndk/platforms/android-3/include/linux/blkdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/blkpg.h b/ndk/platforms/android-3/include/linux/blkpg.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/blkpg.h
rename to ndk/platforms/android-3/include/linux/blkpg.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/blockgroup_lock.h b/ndk/platforms/android-3/include/linux/blockgroup_lock.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/blockgroup_lock.h
rename to ndk/platforms/android-3/include/linux/blockgroup_lock.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/big_endian.h b/ndk/platforms/android-3/include/linux/byteorder/big_endian.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/big_endian.h
rename to ndk/platforms/android-3/include/linux/byteorder/big_endian.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/generic.h b/ndk/platforms/android-3/include/linux/byteorder/generic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/generic.h
rename to ndk/platforms/android-3/include/linux/byteorder/generic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/little_endian.h b/ndk/platforms/android-3/include/linux/byteorder/little_endian.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/little_endian.h
rename to ndk/platforms/android-3/include/linux/byteorder/little_endian.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/swab.h b/ndk/platforms/android-3/include/linux/byteorder/swab.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/swab.h
rename to ndk/platforms/android-3/include/linux/byteorder/swab.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/swabb.h b/ndk/platforms/android-3/include/linux/byteorder/swabb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/byteorder/swabb.h
rename to ndk/platforms/android-3/include/linux/byteorder/swabb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/cache.h b/ndk/platforms/android-3/include/linux/cache.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/cache.h
rename to ndk/platforms/android-3/include/linux/cache.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/calc64.h b/ndk/platforms/android-3/include/linux/calc64.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/calc64.h
rename to ndk/platforms/android-3/include/linux/calc64.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/capability.h b/ndk/platforms/android-3/include/linux/capability.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/capability.h
rename to ndk/platforms/android-3/include/linux/capability.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/capi.h b/ndk/platforms/android-3/include/linux/capi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/capi.h
rename to ndk/platforms/android-3/include/linux/capi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/cdev.h b/ndk/platforms/android-3/include/linux/cdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/cdev.h
rename to ndk/platforms/android-3/include/linux/cdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/cdrom.h b/ndk/platforms/android-3/include/linux/cdrom.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/cdrom.h
rename to ndk/platforms/android-3/include/linux/cdrom.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/circ_buf.h b/ndk/platforms/android-3/include/linux/circ_buf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/circ_buf.h
rename to ndk/platforms/android-3/include/linux/circ_buf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/clk.h b/ndk/platforms/android-3/include/linux/clk.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/clk.h
rename to ndk/platforms/android-3/include/linux/clk.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/coda.h b/ndk/platforms/android-3/include/linux/coda.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/coda.h
rename to ndk/platforms/android-3/include/linux/coda.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/coda_fs_i.h b/ndk/platforms/android-3/include/linux/coda_fs_i.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/coda_fs_i.h
rename to ndk/platforms/android-3/include/linux/coda_fs_i.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/compat.h b/ndk/platforms/android-3/include/linux/compat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/compat.h
rename to ndk/platforms/android-3/include/linux/compat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/compiler-gcc.h b/ndk/platforms/android-3/include/linux/compiler-gcc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/compiler-gcc.h
rename to ndk/platforms/android-3/include/linux/compiler-gcc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/compiler.h b/ndk/platforms/android-3/include/linux/compiler.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/compiler.h
rename to ndk/platforms/android-3/include/linux/compiler.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/completion.h b/ndk/platforms/android-3/include/linux/completion.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/completion.h
rename to ndk/platforms/android-3/include/linux/completion.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/config.h b/ndk/platforms/android-3/include/linux/config.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/config.h
rename to ndk/platforms/android-3/include/linux/config.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/console_struct.h b/ndk/platforms/android-3/include/linux/console_struct.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/console_struct.h
rename to ndk/platforms/android-3/include/linux/console_struct.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/cpu.h b/ndk/platforms/android-3/include/linux/cpu.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/cpu.h
rename to ndk/platforms/android-3/include/linux/cpu.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/cpumask.h b/ndk/platforms/android-3/include/linux/cpumask.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/cpumask.h
rename to ndk/platforms/android-3/include/linux/cpumask.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ctype.h b/ndk/platforms/android-3/include/linux/ctype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ctype.h
rename to ndk/platforms/android-3/include/linux/ctype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/dccp.h b/ndk/platforms/android-3/include/linux/dccp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/dccp.h
rename to ndk/platforms/android-3/include/linux/dccp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/debug_locks.h b/ndk/platforms/android-3/include/linux/debug_locks.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/debug_locks.h
rename to ndk/platforms/android-3/include/linux/debug_locks.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/delay.h b/ndk/platforms/android-3/include/linux/delay.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/delay.h
rename to ndk/platforms/android-3/include/linux/delay.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/device.h b/ndk/platforms/android-3/include/linux/device.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/device.h
rename to ndk/platforms/android-3/include/linux/device.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/dirent.h b/ndk/platforms/android-3/include/linux/dirent.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/dirent.h
rename to ndk/platforms/android-3/include/linux/dirent.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/dm-ioctl.h b/ndk/platforms/android-3/include/linux/dm-ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/dm-ioctl.h
rename to ndk/platforms/android-3/include/linux/dm-ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/dma-mapping.h b/ndk/platforms/android-3/include/linux/dma-mapping.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/dma-mapping.h
rename to ndk/platforms/android-3/include/linux/dma-mapping.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/dmaengine.h b/ndk/platforms/android-3/include/linux/dmaengine.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/dmaengine.h
rename to ndk/platforms/android-3/include/linux/dmaengine.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/efs_dir.h b/ndk/platforms/android-3/include/linux/efs_dir.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/efs_dir.h
rename to ndk/platforms/android-3/include/linux/efs_dir.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/efs_fs_i.h b/ndk/platforms/android-3/include/linux/efs_fs_i.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/efs_fs_i.h
rename to ndk/platforms/android-3/include/linux/efs_fs_i.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/efs_fs_sb.h b/ndk/platforms/android-3/include/linux/efs_fs_sb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/efs_fs_sb.h
rename to ndk/platforms/android-3/include/linux/efs_fs_sb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/elevator.h b/ndk/platforms/android-3/include/linux/elevator.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/elevator.h
rename to ndk/platforms/android-3/include/linux/elevator.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/elf-em.h b/ndk/platforms/android-3/include/linux/elf-em.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/elf-em.h
rename to ndk/platforms/android-3/include/linux/elf-em.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/elf.h b/ndk/platforms/android-3/include/linux/elf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/elf.h
rename to ndk/platforms/android-3/include/linux/elf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/err.h b/ndk/platforms/android-3/include/linux/err.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/err.h
rename to ndk/platforms/android-3/include/linux/err.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/errno.h b/ndk/platforms/android-3/include/linux/errno.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/errno.h
rename to ndk/platforms/android-3/include/linux/errno.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/errqueue.h b/ndk/platforms/android-3/include/linux/errqueue.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/errqueue.h
rename to ndk/platforms/android-3/include/linux/errqueue.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/etherdevice.h b/ndk/platforms/android-3/include/linux/etherdevice.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/etherdevice.h
rename to ndk/platforms/android-3/include/linux/etherdevice.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ext2_fs.h b/ndk/platforms/android-3/include/linux/ext2_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ext2_fs.h
rename to ndk/platforms/android-3/include/linux/ext2_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ext3_fs.h b/ndk/platforms/android-3/include/linux/ext3_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ext3_fs.h
rename to ndk/platforms/android-3/include/linux/ext3_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/fadvise.h b/ndk/platforms/android-3/include/linux/fadvise.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/fadvise.h
rename to ndk/platforms/android-3/include/linux/fadvise.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/fb.h b/ndk/platforms/android-3/include/linux/fb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/fb.h
rename to ndk/platforms/android-3/include/linux/fb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/fcntl.h b/ndk/platforms/android-3/include/linux/fcntl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/fcntl.h
rename to ndk/platforms/android-3/include/linux/fcntl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/fd.h b/ndk/platforms/android-3/include/linux/fd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/fd.h
rename to ndk/platforms/android-3/include/linux/fd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/file.h b/ndk/platforms/android-3/include/linux/file.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/file.h
rename to ndk/platforms/android-3/include/linux/file.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/filter.h b/ndk/platforms/android-3/include/linux/filter.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/filter.h
rename to ndk/platforms/android-3/include/linux/filter.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/fs.h b/ndk/platforms/android-3/include/linux/fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/fs.h
rename to ndk/platforms/android-3/include/linux/fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ftape.h b/ndk/platforms/android-3/include/linux/ftape.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ftape.h
rename to ndk/platforms/android-3/include/linux/ftape.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/futex.h b/ndk/platforms/android-3/include/linux/futex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/futex.h
rename to ndk/platforms/android-3/include/linux/futex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/genhd.h b/ndk/platforms/android-3/include/linux/genhd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/genhd.h
rename to ndk/platforms/android-3/include/linux/genhd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/gfp.h b/ndk/platforms/android-3/include/linux/gfp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/gfp.h
rename to ndk/platforms/android-3/include/linux/gfp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/hardirq.h b/ndk/platforms/android-3/include/linux/hardirq.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/hardirq.h
rename to ndk/platforms/android-3/include/linux/hardirq.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/hdlc/ioctl.h b/ndk/platforms/android-3/include/linux/hdlc/ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/hdlc/ioctl.h
rename to ndk/platforms/android-3/include/linux/hdlc/ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/hdreg.h b/ndk/platforms/android-3/include/linux/hdreg.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/hdreg.h
rename to ndk/platforms/android-3/include/linux/hdreg.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/hdsmart.h b/ndk/platforms/android-3/include/linux/hdsmart.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/hdsmart.h
rename to ndk/platforms/android-3/include/linux/hdsmart.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/highmem.h b/ndk/platforms/android-3/include/linux/highmem.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/highmem.h
rename to ndk/platforms/android-3/include/linux/highmem.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/hil.h b/ndk/platforms/android-3/include/linux/hil.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/hil.h
rename to ndk/platforms/android-3/include/linux/hil.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/i2c.h b/ndk/platforms/android-3/include/linux/i2c.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/i2c.h
rename to ndk/platforms/android-3/include/linux/i2c.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/icmp.h b/ndk/platforms/android-3/include/linux/icmp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/icmp.h
rename to ndk/platforms/android-3/include/linux/icmp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if.h b/ndk/platforms/android-3/include/linux/if.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if.h
rename to ndk/platforms/android-3/include/linux/if.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_arcnet.h b/ndk/platforms/android-3/include/linux/if_arcnet.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_arcnet.h
rename to ndk/platforms/android-3/include/linux/if_arcnet.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_arp.h b/ndk/platforms/android-3/include/linux/if_arp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_arp.h
rename to ndk/platforms/android-3/include/linux/if_arp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_bridge.h b/ndk/platforms/android-3/include/linux/if_bridge.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_bridge.h
rename to ndk/platforms/android-3/include/linux/if_bridge.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_ether.h b/ndk/platforms/android-3/include/linux/if_ether.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_ether.h
rename to ndk/platforms/android-3/include/linux/if_ether.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_fc.h b/ndk/platforms/android-3/include/linux/if_fc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_fc.h
rename to ndk/platforms/android-3/include/linux/if_fc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_fddi.h b/ndk/platforms/android-3/include/linux/if_fddi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_fddi.h
rename to ndk/platforms/android-3/include/linux/if_fddi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_hippi.h b/ndk/platforms/android-3/include/linux/if_hippi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_hippi.h
rename to ndk/platforms/android-3/include/linux/if_hippi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_packet.h b/ndk/platforms/android-3/include/linux/if_packet.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_packet.h
rename to ndk/platforms/android-3/include/linux/if_packet.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_ppp.h b/ndk/platforms/android-3/include/linux/if_ppp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_ppp.h
rename to ndk/platforms/android-3/include/linux/if_ppp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_tr.h b/ndk/platforms/android-3/include/linux/if_tr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_tr.h
rename to ndk/platforms/android-3/include/linux/if_tr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_tun.h b/ndk/platforms/android-3/include/linux/if_tun.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_tun.h
rename to ndk/platforms/android-3/include/linux/if_tun.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/if_vlan.h b/ndk/platforms/android-3/include/linux/if_vlan.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/if_vlan.h
rename to ndk/platforms/android-3/include/linux/if_vlan.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/in.h b/ndk/platforms/android-3/include/linux/in.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/in.h
rename to ndk/platforms/android-3/include/linux/in.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/in6.h b/ndk/platforms/android-3/include/linux/in6.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/in6.h
rename to ndk/platforms/android-3/include/linux/in6.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/init.h b/ndk/platforms/android-3/include/linux/init.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/init.h
rename to ndk/platforms/android-3/include/linux/init.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/inotify.h b/ndk/platforms/android-3/include/linux/inotify.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/inotify.h
rename to ndk/platforms/android-3/include/linux/inotify.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/input.h b/ndk/platforms/android-3/include/linux/input.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/input.h
rename to ndk/platforms/android-3/include/linux/input.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/interrupt.h b/ndk/platforms/android-3/include/linux/interrupt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/interrupt.h
rename to ndk/platforms/android-3/include/linux/interrupt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ioctl.h b/ndk/platforms/android-3/include/linux/ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ioctl.h
rename to ndk/platforms/android-3/include/linux/ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ioport.h b/ndk/platforms/android-3/include/linux/ioport.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ioport.h
rename to ndk/platforms/android-3/include/linux/ioport.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ioprio.h b/ndk/platforms/android-3/include/linux/ioprio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ioprio.h
rename to ndk/platforms/android-3/include/linux/ioprio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ip.h b/ndk/platforms/android-3/include/linux/ip.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ip.h
rename to ndk/platforms/android-3/include/linux/ip.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ipc.h b/ndk/platforms/android-3/include/linux/ipc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ipc.h
rename to ndk/platforms/android-3/include/linux/ipc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ipmi_msgdefs.h b/ndk/platforms/android-3/include/linux/ipmi_msgdefs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ipmi_msgdefs.h
rename to ndk/platforms/android-3/include/linux/ipmi_msgdefs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ipmi_smi.h b/ndk/platforms/android-3/include/linux/ipmi_smi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ipmi_smi.h
rename to ndk/platforms/android-3/include/linux/ipmi_smi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ipx.h b/ndk/platforms/android-3/include/linux/ipx.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ipx.h
rename to ndk/platforms/android-3/include/linux/ipx.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/irq.h b/ndk/platforms/android-3/include/linux/irq.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/irq.h
rename to ndk/platforms/android-3/include/linux/irq.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/irq_cpustat.h b/ndk/platforms/android-3/include/linux/irq_cpustat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/irq_cpustat.h
rename to ndk/platforms/android-3/include/linux/irq_cpustat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/irqflags.h b/ndk/platforms/android-3/include/linux/irqflags.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/irqflags.h
rename to ndk/platforms/android-3/include/linux/irqflags.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/irqreturn.h b/ndk/platforms/android-3/include/linux/irqreturn.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/irqreturn.h
rename to ndk/platforms/android-3/include/linux/irqreturn.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/jbd.h b/ndk/platforms/android-3/include/linux/jbd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/jbd.h
rename to ndk/platforms/android-3/include/linux/jbd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/jiffies.h b/ndk/platforms/android-3/include/linux/jiffies.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/jiffies.h
rename to ndk/platforms/android-3/include/linux/jiffies.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kd.h b/ndk/platforms/android-3/include/linux/kd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kd.h
rename to ndk/platforms/android-3/include/linux/kd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kdev_t.h b/ndk/platforms/android-3/include/linux/kdev_t.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kdev_t.h
rename to ndk/platforms/android-3/include/linux/kdev_t.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kernel.h b/ndk/platforms/android-3/include/linux/kernel.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kernel.h
rename to ndk/platforms/android-3/include/linux/kernel.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kernel_stat.h b/ndk/platforms/android-3/include/linux/kernel_stat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kernel_stat.h
rename to ndk/platforms/android-3/include/linux/kernel_stat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kernelcapi.h b/ndk/platforms/android-3/include/linux/kernelcapi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kernelcapi.h
rename to ndk/platforms/android-3/include/linux/kernelcapi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kexec.h b/ndk/platforms/android-3/include/linux/kexec.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kexec.h
rename to ndk/platforms/android-3/include/linux/kexec.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/key.h b/ndk/platforms/android-3/include/linux/key.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/key.h
rename to ndk/platforms/android-3/include/linux/key.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/keyboard.h b/ndk/platforms/android-3/include/linux/keyboard.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/keyboard.h
rename to ndk/platforms/android-3/include/linux/keyboard.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/keychord.h b/ndk/platforms/android-3/include/linux/keychord.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/keychord.h
rename to ndk/platforms/android-3/include/linux/keychord.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/klist.h b/ndk/platforms/android-3/include/linux/klist.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/klist.h
rename to ndk/platforms/android-3/include/linux/klist.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kmod.h b/ndk/platforms/android-3/include/linux/kmod.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kmod.h
rename to ndk/platforms/android-3/include/linux/kmod.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kobject.h b/ndk/platforms/android-3/include/linux/kobject.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kobject.h
rename to ndk/platforms/android-3/include/linux/kobject.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/kref.h b/ndk/platforms/android-3/include/linux/kref.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/kref.h
rename to ndk/platforms/android-3/include/linux/kref.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ktime.h b/ndk/platforms/android-3/include/linux/ktime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ktime.h
rename to ndk/platforms/android-3/include/linux/ktime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/limits.h b/ndk/platforms/android-3/include/linux/limits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/limits.h
rename to ndk/platforms/android-3/include/linux/limits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/linkage.h b/ndk/platforms/android-3/include/linux/linkage.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/linkage.h
rename to ndk/platforms/android-3/include/linux/linkage.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/list.h b/ndk/platforms/android-3/include/linux/list.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/list.h
rename to ndk/platforms/android-3/include/linux/list.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/lockd/nlm.h b/ndk/platforms/android-3/include/linux/lockd/nlm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/lockd/nlm.h
rename to ndk/platforms/android-3/include/linux/lockd/nlm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/lockd/xdr.h b/ndk/platforms/android-3/include/linux/lockd/xdr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/lockd/xdr.h
rename to ndk/platforms/android-3/include/linux/lockd/xdr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/lockdep.h b/ndk/platforms/android-3/include/linux/lockdep.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/lockdep.h
rename to ndk/platforms/android-3/include/linux/lockdep.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/loop.h b/ndk/platforms/android-3/include/linux/loop.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/loop.h
rename to ndk/platforms/android-3/include/linux/loop.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/magic.h b/ndk/platforms/android-3/include/linux/magic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/magic.h
rename to ndk/platforms/android-3/include/linux/magic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/major.h b/ndk/platforms/android-3/include/linux/major.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/major.h
rename to ndk/platforms/android-3/include/linux/major.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mc146818rtc.h b/ndk/platforms/android-3/include/linux/mc146818rtc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mc146818rtc.h
rename to ndk/platforms/android-3/include/linux/mc146818rtc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mca.h b/ndk/platforms/android-3/include/linux/mca.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mca.h
rename to ndk/platforms/android-3/include/linux/mca.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mempolicy.h b/ndk/platforms/android-3/include/linux/mempolicy.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mempolicy.h
rename to ndk/platforms/android-3/include/linux/mempolicy.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mempool.h b/ndk/platforms/android-3/include/linux/mempool.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mempool.h
rename to ndk/platforms/android-3/include/linux/mempool.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/miscdevice.h b/ndk/platforms/android-3/include/linux/miscdevice.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/miscdevice.h
rename to ndk/platforms/android-3/include/linux/miscdevice.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mm.h b/ndk/platforms/android-3/include/linux/mm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mm.h
rename to ndk/platforms/android-3/include/linux/mm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/card.h b/ndk/platforms/android-3/include/linux/mmc/card.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/card.h
rename to ndk/platforms/android-3/include/linux/mmc/card.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/host.h b/ndk/platforms/android-3/include/linux/mmc/host.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/host.h
rename to ndk/platforms/android-3/include/linux/mmc/host.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/mmc.h b/ndk/platforms/android-3/include/linux/mmc/mmc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mmc/mmc.h
rename to ndk/platforms/android-3/include/linux/mmc/mmc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mmzone.h b/ndk/platforms/android-3/include/linux/mmzone.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mmzone.h
rename to ndk/platforms/android-3/include/linux/mmzone.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mod_devicetable.h b/ndk/platforms/android-3/include/linux/mod_devicetable.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mod_devicetable.h
rename to ndk/platforms/android-3/include/linux/mod_devicetable.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/module.h b/ndk/platforms/android-3/include/linux/module.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/module.h
rename to ndk/platforms/android-3/include/linux/module.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/moduleparam.h b/ndk/platforms/android-3/include/linux/moduleparam.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/moduleparam.h
rename to ndk/platforms/android-3/include/linux/moduleparam.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mount.h b/ndk/platforms/android-3/include/linux/mount.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mount.h
rename to ndk/platforms/android-3/include/linux/mount.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/msdos_fs.h b/ndk/platforms/android-3/include/linux/msdos_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/msdos_fs.h
rename to ndk/platforms/android-3/include/linux/msdos_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/msg.h b/ndk/platforms/android-3/include/linux/msg.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/msg.h
rename to ndk/platforms/android-3/include/linux/msg.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/msm_adsp.h b/ndk/platforms/android-3/include/linux/msm_adsp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/msm_adsp.h
rename to ndk/platforms/android-3/include/linux/msm_adsp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/msm_audio.h b/ndk/platforms/android-3/include/linux/msm_audio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/msm_audio.h
rename to ndk/platforms/android-3/include/linux/msm_audio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/msm_mdp.h b/ndk/platforms/android-3/include/linux/msm_mdp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/msm_mdp.h
rename to ndk/platforms/android-3/include/linux/msm_mdp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mt9t013.h b/ndk/platforms/android-3/include/linux/mt9t013.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mt9t013.h
rename to ndk/platforms/android-3/include/linux/mt9t013.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/bbm.h b/ndk/platforms/android-3/include/linux/mtd/bbm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/bbm.h
rename to ndk/platforms/android-3/include/linux/mtd/bbm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/blktrans.h b/ndk/platforms/android-3/include/linux/mtd/blktrans.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/blktrans.h
rename to ndk/platforms/android-3/include/linux/mtd/blktrans.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi.h b/ndk/platforms/android-3/include/linux/mtd/cfi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi.h
rename to ndk/platforms/android-3/include/linux/mtd/cfi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi_endian.h b/ndk/platforms/android-3/include/linux/mtd/cfi_endian.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/cfi_endian.h
rename to ndk/platforms/android-3/include/linux/mtd/cfi_endian.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/compatmac.h b/ndk/platforms/android-3/include/linux/mtd/compatmac.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/compatmac.h
rename to ndk/platforms/android-3/include/linux/mtd/compatmac.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/flashchip.h b/ndk/platforms/android-3/include/linux/mtd/flashchip.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/flashchip.h
rename to ndk/platforms/android-3/include/linux/mtd/flashchip.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/map.h b/ndk/platforms/android-3/include/linux/mtd/map.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/map.h
rename to ndk/platforms/android-3/include/linux/mtd/map.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/mtd.h b/ndk/platforms/android-3/include/linux/mtd/mtd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/mtd.h
rename to ndk/platforms/android-3/include/linux/mtd/mtd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nand.h b/ndk/platforms/android-3/include/linux/mtd/nand.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nand.h
rename to ndk/platforms/android-3/include/linux/mtd/nand.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nand_ecc.h b/ndk/platforms/android-3/include/linux/mtd/nand_ecc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nand_ecc.h
rename to ndk/platforms/android-3/include/linux/mtd/nand_ecc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nftl.h b/ndk/platforms/android-3/include/linux/mtd/nftl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/nftl.h
rename to ndk/platforms/android-3/include/linux/mtd/nftl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/onenand_regs.h b/ndk/platforms/android-3/include/linux/mtd/onenand_regs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/onenand_regs.h
rename to ndk/platforms/android-3/include/linux/mtd/onenand_regs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/partitions.h b/ndk/platforms/android-3/include/linux/mtd/partitions.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtd/partitions.h
rename to ndk/platforms/android-3/include/linux/mtd/partitions.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mtio.h b/ndk/platforms/android-3/include/linux/mtio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mtio.h
rename to ndk/platforms/android-3/include/linux/mtio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mutex-debug.h b/ndk/platforms/android-3/include/linux/mutex-debug.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mutex-debug.h
rename to ndk/platforms/android-3/include/linux/mutex-debug.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/mutex.h b/ndk/platforms/android-3/include/linux/mutex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/mutex.h
rename to ndk/platforms/android-3/include/linux/mutex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ncp.h b/ndk/platforms/android-3/include/linux/ncp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ncp.h
rename to ndk/platforms/android-3/include/linux/ncp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ncp_mount.h b/ndk/platforms/android-3/include/linux/ncp_mount.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ncp_mount.h
rename to ndk/platforms/android-3/include/linux/ncp_mount.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ncp_no.h b/ndk/platforms/android-3/include/linux/ncp_no.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ncp_no.h
rename to ndk/platforms/android-3/include/linux/ncp_no.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/net.h b/ndk/platforms/android-3/include/linux/net.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/net.h
rename to ndk/platforms/android-3/include/linux/net.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netdevice.h b/ndk/platforms/android-3/include/linux/netdevice.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netdevice.h
rename to ndk/platforms/android-3/include/linux/netdevice.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter.h b/ndk/platforms/android-3/include/linux/netfilter.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter.h
rename to ndk/platforms/android-3/include/linux/netfilter.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h b/ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h
rename to ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_common.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h b/ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h
rename to ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h b/ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h
rename to ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h b/ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h
rename to ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to ndk/platforms/android-3/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink.h b/ndk/platforms/android-3/include/linux/netfilter/nfnetlink.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink.h
rename to ndk/platforms/android-3/include/linux/netfilter/nfnetlink.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h b/ndk/platforms/android-3/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h
rename to ndk/platforms/android-3/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/x_tables.h b/ndk/platforms/android-3/include/linux/netfilter/x_tables.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/x_tables.h
rename to ndk/platforms/android-3/include/linux/netfilter/x_tables.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h b/ndk/platforms/android-3/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h b/ndk/platforms/android-3/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h b/ndk/platforms/android-3/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h b/ndk/platforms/android-3/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_SECMARK.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_comment.h b/ndk/platforms/android-3/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_comment.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_comment.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_connbytes.h b/ndk/platforms/android-3/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_connbytes.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_connbytes.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_conntrack.h b/ndk/platforms/android-3/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_conntrack.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_conntrack.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_dccp.h b/ndk/platforms/android-3/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_dccp.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_dccp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_esp.h b/ndk/platforms/android-3/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_esp.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_esp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_helper.h b/ndk/platforms/android-3/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_helper.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_helper.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_length.h b/ndk/platforms/android-3/include/linux/netfilter/xt_length.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_length.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_length.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_limit.h b/ndk/platforms/android-3/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_limit.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_limit.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_mac.h b/ndk/platforms/android-3/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_mac.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_mac.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_multiport.h b/ndk/platforms/android-3/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_multiport.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_multiport.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_physdev.h b/ndk/platforms/android-3/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_physdev.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_physdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_pkttype.h b/ndk/platforms/android-3/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_pkttype.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_pkttype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_quota.h b/ndk/platforms/android-3/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_quota.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_quota.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_realm.h b/ndk/platforms/android-3/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_realm.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_realm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_sctp.h b/ndk/platforms/android-3/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_sctp.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_sctp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_state.h b/ndk/platforms/android-3/include/linux/netfilter/xt_state.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_state.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_state.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_statistic.h b/ndk/platforms/android-3/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_statistic.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_statistic.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_string.h b/ndk/platforms/android-3/include/linux/netfilter/xt_string.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_string.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_string.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h b/ndk/platforms/android-3/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_tcpmss.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h b/ndk/platforms/android-3/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h
rename to ndk/platforms/android-3/include/linux/netfilter/xt_tcpudp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp.h b/ndk/platforms/android-3/include/linux/netfilter_arp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp.h
rename to ndk/platforms/android-3/include/linux/netfilter_arp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h b/ndk/platforms/android-3/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h
rename to ndk/platforms/android-3/include/linux/netfilter_arp/arp_tables.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_bridge.h b/ndk/platforms/android-3/include/linux/netfilter_bridge.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_bridge.h
rename to ndk/platforms/android-3/include/linux/netfilter_bridge.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_conntrack.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_conntrack.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_nat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_nat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_nat_rule.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_nat_rule.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_nat_rule.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_queue.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_queue.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_queue.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_DSCP.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_DSCP.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_DSCP.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TCPMSS.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TCPMSS.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TOS.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TOS.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TOS.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_addrtype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_addrtype.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_addrtype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_comment.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_comment.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_comment.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_connbytes.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_connbytes.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_connbytes.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_dccp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dccp.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_dccp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_dscp_.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_dscp_.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_dscp_.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_esp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_esp.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_esp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_hashlimit.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_hashlimit.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_helper.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_helper.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_helper.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_iprange.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_iprange.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_iprange.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_length.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_length.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_length.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_mac.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_mac.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_mac.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_owner.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_owner.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_owner.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_physdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_physdev.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_physdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_pkttype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_pkttype.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_pkttype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_realm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_realm.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_realm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_recent.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_recent.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_recent.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_sctp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_sctp.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_sctp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_state.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_state.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_state.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_string.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_string.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_string.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h b/ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_tos_.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv4/ipt_tos_.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv4/ipt_tos_.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_esp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_esp.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_esp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_length.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_length.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_length.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_mac.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mac.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_mac.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_owner.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_owner.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_owner.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_physdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_physdev.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_physdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h
rename to ndk/platforms/android-3/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/netlink.h b/ndk/platforms/android-3/include/linux/netlink.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/netlink.h
rename to ndk/platforms/android-3/include/linux/netlink.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfs.h b/ndk/platforms/android-3/include/linux/nfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfs.h
rename to ndk/platforms/android-3/include/linux/nfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfs2.h b/ndk/platforms/android-3/include/linux/nfs2.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfs2.h
rename to ndk/platforms/android-3/include/linux/nfs2.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfs3.h b/ndk/platforms/android-3/include/linux/nfs3.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfs3.h
rename to ndk/platforms/android-3/include/linux/nfs3.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfs4.h b/ndk/platforms/android-3/include/linux/nfs4.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfs4.h
rename to ndk/platforms/android-3/include/linux/nfs4.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfs_xdr.h b/ndk/platforms/android-3/include/linux/nfs_xdr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfs_xdr.h
rename to ndk/platforms/android-3/include/linux/nfs_xdr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsacl.h b/ndk/platforms/android-3/include/linux/nfsacl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsacl.h
rename to ndk/platforms/android-3/include/linux/nfsacl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/auth.h b/ndk/platforms/android-3/include/linux/nfsd/auth.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/auth.h
rename to ndk/platforms/android-3/include/linux/nfsd/auth.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/const.h b/ndk/platforms/android-3/include/linux/nfsd/const.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/const.h
rename to ndk/platforms/android-3/include/linux/nfsd/const.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/debug.h b/ndk/platforms/android-3/include/linux/nfsd/debug.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/debug.h
rename to ndk/platforms/android-3/include/linux/nfsd/debug.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/export.h b/ndk/platforms/android-3/include/linux/nfsd/export.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/export.h
rename to ndk/platforms/android-3/include/linux/nfsd/export.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/interface.h b/ndk/platforms/android-3/include/linux/nfsd/interface.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/interface.h
rename to ndk/platforms/android-3/include/linux/nfsd/interface.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/nfsfh.h b/ndk/platforms/android-3/include/linux/nfsd/nfsfh.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/nfsfh.h
rename to ndk/platforms/android-3/include/linux/nfsd/nfsfh.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/stats.h b/ndk/platforms/android-3/include/linux/nfsd/stats.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/stats.h
rename to ndk/platforms/android-3/include/linux/nfsd/stats.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/xdr.h b/ndk/platforms/android-3/include/linux/nfsd/xdr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nfsd/xdr.h
rename to ndk/platforms/android-3/include/linux/nfsd/xdr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/node.h b/ndk/platforms/android-3/include/linux/node.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/node.h
rename to ndk/platforms/android-3/include/linux/node.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nodemask.h b/ndk/platforms/android-3/include/linux/nodemask.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nodemask.h
rename to ndk/platforms/android-3/include/linux/nodemask.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/notifier.h b/ndk/platforms/android-3/include/linux/notifier.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/notifier.h
rename to ndk/platforms/android-3/include/linux/notifier.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/numa.h b/ndk/platforms/android-3/include/linux/numa.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/numa.h
rename to ndk/platforms/android-3/include/linux/numa.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/nvram.h b/ndk/platforms/android-3/include/linux/nvram.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/nvram.h
rename to ndk/platforms/android-3/include/linux/nvram.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/omap_csmi.h b/ndk/platforms/android-3/include/linux/omap_csmi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/omap_csmi.h
rename to ndk/platforms/android-3/include/linux/omap_csmi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pagemap.h b/ndk/platforms/android-3/include/linux/pagemap.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pagemap.h
rename to ndk/platforms/android-3/include/linux/pagemap.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/param.h b/ndk/platforms/android-3/include/linux/param.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/param.h
rename to ndk/platforms/android-3/include/linux/param.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/patchkey.h b/ndk/platforms/android-3/include/linux/patchkey.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/patchkey.h
rename to ndk/platforms/android-3/include/linux/patchkey.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pci.h b/ndk/platforms/android-3/include/linux/pci.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pci.h
rename to ndk/platforms/android-3/include/linux/pci.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pci_ids.h b/ndk/platforms/android-3/include/linux/pci_ids.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pci_ids.h
rename to ndk/platforms/android-3/include/linux/pci_ids.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pci_regs.h b/ndk/platforms/android-3/include/linux/pci_regs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pci_regs.h
rename to ndk/platforms/android-3/include/linux/pci_regs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/percpu.h b/ndk/platforms/android-3/include/linux/percpu.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/percpu.h
rename to ndk/platforms/android-3/include/linux/percpu.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/percpu_counter.h b/ndk/platforms/android-3/include/linux/percpu_counter.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/percpu_counter.h
rename to ndk/platforms/android-3/include/linux/percpu_counter.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/personality.h b/ndk/platforms/android-3/include/linux/personality.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/personality.h
rename to ndk/platforms/android-3/include/linux/personality.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pfkeyv2.h b/ndk/platforms/android-3/include/linux/pfkeyv2.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pfkeyv2.h
rename to ndk/platforms/android-3/include/linux/pfkeyv2.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pkt_cls.h b/ndk/platforms/android-3/include/linux/pkt_cls.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pkt_cls.h
rename to ndk/platforms/android-3/include/linux/pkt_cls.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pkt_sched.h b/ndk/platforms/android-3/include/linux/pkt_sched.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pkt_sched.h
rename to ndk/platforms/android-3/include/linux/pkt_sched.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/platform_device.h b/ndk/platforms/android-3/include/linux/platform_device.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/platform_device.h
rename to ndk/platforms/android-3/include/linux/platform_device.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/plist.h b/ndk/platforms/android-3/include/linux/plist.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/plist.h
rename to ndk/platforms/android-3/include/linux/plist.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pm.h b/ndk/platforms/android-3/include/linux/pm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pm.h
rename to ndk/platforms/android-3/include/linux/pm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/pnp.h b/ndk/platforms/android-3/include/linux/pnp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/pnp.h
rename to ndk/platforms/android-3/include/linux/pnp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/poll.h b/ndk/platforms/android-3/include/linux/poll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/poll.h
rename to ndk/platforms/android-3/include/linux/poll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/posix_acl.h b/ndk/platforms/android-3/include/linux/posix_acl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/posix_acl.h
rename to ndk/platforms/android-3/include/linux/posix_acl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/posix_types.h b/ndk/platforms/android-3/include/linux/posix_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/posix_types.h
rename to ndk/platforms/android-3/include/linux/posix_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ppdev.h b/ndk/platforms/android-3/include/linux/ppdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ppdev.h
rename to ndk/platforms/android-3/include/linux/ppdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ppp_defs.h b/ndk/platforms/android-3/include/linux/ppp_defs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ppp_defs.h
rename to ndk/platforms/android-3/include/linux/ppp_defs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/prctl.h b/ndk/platforms/android-3/include/linux/prctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/prctl.h
rename to ndk/platforms/android-3/include/linux/prctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/preempt.h b/ndk/platforms/android-3/include/linux/preempt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/preempt.h
rename to ndk/platforms/android-3/include/linux/preempt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/proc_fs.h b/ndk/platforms/android-3/include/linux/proc_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/proc_fs.h
rename to ndk/platforms/android-3/include/linux/proc_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ptrace.h b/ndk/platforms/android-3/include/linux/ptrace.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ptrace.h
rename to ndk/platforms/android-3/include/linux/ptrace.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/qic117.h b/ndk/platforms/android-3/include/linux/qic117.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/qic117.h
rename to ndk/platforms/android-3/include/linux/qic117.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/qnxtypes.h b/ndk/platforms/android-3/include/linux/qnxtypes.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/qnxtypes.h
rename to ndk/platforms/android-3/include/linux/qnxtypes.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/quota.h b/ndk/platforms/android-3/include/linux/quota.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/quota.h
rename to ndk/platforms/android-3/include/linux/quota.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md.h b/ndk/platforms/android-3/include/linux/raid/md.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md.h
rename to ndk/platforms/android-3/include/linux/raid/md.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_k.h b/ndk/platforms/android-3/include/linux/raid/md_k.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_k.h
rename to ndk/platforms/android-3/include/linux/raid/md_k.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_p.h b/ndk/platforms/android-3/include/linux/raid/md_p.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_p.h
rename to ndk/platforms/android-3/include/linux/raid/md_p.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_u.h b/ndk/platforms/android-3/include/linux/raid/md_u.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/raid/md_u.h
rename to ndk/platforms/android-3/include/linux/raid/md_u.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/raid/xor.h b/ndk/platforms/android-3/include/linux/raid/xor.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/raid/xor.h
rename to ndk/platforms/android-3/include/linux/raid/xor.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/random.h b/ndk/platforms/android-3/include/linux/random.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/random.h
rename to ndk/platforms/android-3/include/linux/random.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/rbtree.h b/ndk/platforms/android-3/include/linux/rbtree.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/rbtree.h
rename to ndk/platforms/android-3/include/linux/rbtree.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/rcupdate.h b/ndk/platforms/android-3/include/linux/rcupdate.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/rcupdate.h
rename to ndk/platforms/android-3/include/linux/rcupdate.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/reboot.h b/ndk/platforms/android-3/include/linux/reboot.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/reboot.h
rename to ndk/platforms/android-3/include/linux/reboot.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/relay.h b/ndk/platforms/android-3/include/linux/relay.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/relay.h
rename to ndk/platforms/android-3/include/linux/relay.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/resource.h b/ndk/platforms/android-3/include/linux/resource.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/resource.h
rename to ndk/platforms/android-3/include/linux/resource.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/route.h b/ndk/platforms/android-3/include/linux/route.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/route.h
rename to ndk/platforms/android-3/include/linux/route.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/rtc.h b/ndk/platforms/android-3/include/linux/rtc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/rtc.h
rename to ndk/platforms/android-3/include/linux/rtc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/rtnetlink.h b/ndk/platforms/android-3/include/linux/rtnetlink.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/rtnetlink.h
rename to ndk/platforms/android-3/include/linux/rtnetlink.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/rwsem.h b/ndk/platforms/android-3/include/linux/rwsem.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/rwsem.h
rename to ndk/platforms/android-3/include/linux/rwsem.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sched.h b/ndk/platforms/android-3/include/linux/sched.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sched.h
rename to ndk/platforms/android-3/include/linux/sched.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sem.h b/ndk/platforms/android-3/include/linux/sem.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sem.h
rename to ndk/platforms/android-3/include/linux/sem.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/seq_file.h b/ndk/platforms/android-3/include/linux/seq_file.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/seq_file.h
rename to ndk/platforms/android-3/include/linux/seq_file.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/seqlock.h b/ndk/platforms/android-3/include/linux/seqlock.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/seqlock.h
rename to ndk/platforms/android-3/include/linux/seqlock.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/serial_core.h b/ndk/platforms/android-3/include/linux/serial_core.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/serial_core.h
rename to ndk/platforms/android-3/include/linux/serial_core.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/serial_reg.h b/ndk/platforms/android-3/include/linux/serial_reg.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/serial_reg.h
rename to ndk/platforms/android-3/include/linux/serial_reg.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/serio.h b/ndk/platforms/android-3/include/linux/serio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/serio.h
rename to ndk/platforms/android-3/include/linux/serio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/shm.h b/ndk/platforms/android-3/include/linux/shm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/shm.h
rename to ndk/platforms/android-3/include/linux/shm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/signal.h b/ndk/platforms/android-3/include/linux/signal.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/signal.h
rename to ndk/platforms/android-3/include/linux/signal.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/skbuff.h b/ndk/platforms/android-3/include/linux/skbuff.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/skbuff.h
rename to ndk/platforms/android-3/include/linux/skbuff.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/slab.h b/ndk/platforms/android-3/include/linux/slab.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/slab.h
rename to ndk/platforms/android-3/include/linux/slab.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/smb.h b/ndk/platforms/android-3/include/linux/smb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/smb.h
rename to ndk/platforms/android-3/include/linux/smb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/smp.h b/ndk/platforms/android-3/include/linux/smp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/smp.h
rename to ndk/platforms/android-3/include/linux/smp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/smp_lock.h b/ndk/platforms/android-3/include/linux/smp_lock.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/smp_lock.h
rename to ndk/platforms/android-3/include/linux/smp_lock.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/socket.h b/ndk/platforms/android-3/include/linux/socket.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/socket.h
rename to ndk/platforms/android-3/include/linux/socket.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sockios.h b/ndk/platforms/android-3/include/linux/sockios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sockios.h
rename to ndk/platforms/android-3/include/linux/sockios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/soundcard.h b/ndk/platforms/android-3/include/linux/soundcard.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/soundcard.h
rename to ndk/platforms/android-3/include/linux/soundcard.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock.h b/ndk/platforms/android-3/include/linux/spinlock.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock.h
rename to ndk/platforms/android-3/include/linux/spinlock.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_smp.h b/ndk/platforms/android-3/include/linux/spinlock_api_smp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_smp.h
rename to ndk/platforms/android-3/include/linux/spinlock_api_smp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_up.h b/ndk/platforms/android-3/include/linux/spinlock_api_up.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_api_up.h
rename to ndk/platforms/android-3/include/linux/spinlock_api_up.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_types.h b/ndk/platforms/android-3/include/linux/spinlock_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_types.h
rename to ndk/platforms/android-3/include/linux/spinlock_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_types_up.h b/ndk/platforms/android-3/include/linux/spinlock_types_up.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_types_up.h
rename to ndk/platforms/android-3/include/linux/spinlock_types_up.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_up.h b/ndk/platforms/android-3/include/linux/spinlock_up.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/spinlock_up.h
rename to ndk/platforms/android-3/include/linux/spinlock_up.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/stacktrace.h b/ndk/platforms/android-3/include/linux/stacktrace.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/stacktrace.h
rename to ndk/platforms/android-3/include/linux/stacktrace.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/stat.h b/ndk/platforms/android-3/include/linux/stat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/stat.h
rename to ndk/platforms/android-3/include/linux/stat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/statfs.h b/ndk/platforms/android-3/include/linux/statfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/statfs.h
rename to ndk/platforms/android-3/include/linux/statfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/stddef.h b/ndk/platforms/android-3/include/linux/stddef.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/stddef.h
rename to ndk/platforms/android-3/include/linux/stddef.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/string.h b/ndk/platforms/android-3/include/linux/string.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/string.h
rename to ndk/platforms/android-3/include/linux/string.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/stringify.h b/ndk/platforms/android-3/include/linux/stringify.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/stringify.h
rename to ndk/platforms/android-3/include/linux/stringify.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth.h b/ndk/platforms/android-3/include/linux/sunrpc/auth.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth.h
rename to ndk/platforms/android-3/include/linux/sunrpc/auth.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth_gss.h b/ndk/platforms/android-3/include/linux/sunrpc/auth_gss.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/auth_gss.h
rename to ndk/platforms/android-3/include/linux/sunrpc/auth_gss.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/clnt.h b/ndk/platforms/android-3/include/linux/sunrpc/clnt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/clnt.h
rename to ndk/platforms/android-3/include/linux/sunrpc/clnt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/debug.h b/ndk/platforms/android-3/include/linux/sunrpc/debug.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/debug.h
rename to ndk/platforms/android-3/include/linux/sunrpc/debug.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_api.h b/ndk/platforms/android-3/include/linux/sunrpc/gss_api.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_api.h
rename to ndk/platforms/android-3/include/linux/sunrpc/gss_api.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_asn1.h b/ndk/platforms/android-3/include/linux/sunrpc/gss_asn1.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_asn1.h
rename to ndk/platforms/android-3/include/linux/sunrpc/gss_asn1.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_err.h b/ndk/platforms/android-3/include/linux/sunrpc/gss_err.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/gss_err.h
rename to ndk/platforms/android-3/include/linux/sunrpc/gss_err.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/msg_prot.h b/ndk/platforms/android-3/include/linux/sunrpc/msg_prot.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/msg_prot.h
rename to ndk/platforms/android-3/include/linux/sunrpc/msg_prot.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/sched.h b/ndk/platforms/android-3/include/linux/sunrpc/sched.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/sched.h
rename to ndk/platforms/android-3/include/linux/sunrpc/sched.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/stats.h b/ndk/platforms/android-3/include/linux/sunrpc/stats.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/stats.h
rename to ndk/platforms/android-3/include/linux/sunrpc/stats.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svc.h b/ndk/platforms/android-3/include/linux/sunrpc/svc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svc.h
rename to ndk/platforms/android-3/include/linux/sunrpc/svc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svcauth.h b/ndk/platforms/android-3/include/linux/sunrpc/svcauth.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/svcauth.h
rename to ndk/platforms/android-3/include/linux/sunrpc/svcauth.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/timer.h b/ndk/platforms/android-3/include/linux/sunrpc/timer.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/timer.h
rename to ndk/platforms/android-3/include/linux/sunrpc/timer.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/types.h b/ndk/platforms/android-3/include/linux/sunrpc/types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/types.h
rename to ndk/platforms/android-3/include/linux/sunrpc/types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xdr.h b/ndk/platforms/android-3/include/linux/sunrpc/xdr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xdr.h
rename to ndk/platforms/android-3/include/linux/sunrpc/xdr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xprt.h b/ndk/platforms/android-3/include/linux/sunrpc/xprt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sunrpc/xprt.h
rename to ndk/platforms/android-3/include/linux/sunrpc/xprt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/swap.h b/ndk/platforms/android-3/include/linux/swap.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/swap.h
rename to ndk/platforms/android-3/include/linux/swap.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sysctl.h b/ndk/platforms/android-3/include/linux/sysctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sysctl.h
rename to ndk/platforms/android-3/include/linux/sysctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sysdev.h b/ndk/platforms/android-3/include/linux/sysdev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sysdev.h
rename to ndk/platforms/android-3/include/linux/sysdev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/sysfs.h b/ndk/platforms/android-3/include/linux/sysfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/sysfs.h
rename to ndk/platforms/android-3/include/linux/sysfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/taskstats.h b/ndk/platforms/android-3/include/linux/taskstats.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/taskstats.h
rename to ndk/platforms/android-3/include/linux/taskstats.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/taskstats_kern.h b/ndk/platforms/android-3/include/linux/taskstats_kern.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/taskstats_kern.h
rename to ndk/platforms/android-3/include/linux/taskstats_kern.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/tcp.h b/ndk/platforms/android-3/include/linux/tcp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/tcp.h
rename to ndk/platforms/android-3/include/linux/tcp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/telephony.h b/ndk/platforms/android-3/include/linux/telephony.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/telephony.h
rename to ndk/platforms/android-3/include/linux/telephony.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/termios.h b/ndk/platforms/android-3/include/linux/termios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/termios.h
rename to ndk/platforms/android-3/include/linux/termios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/textsearch.h b/ndk/platforms/android-3/include/linux/textsearch.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/textsearch.h
rename to ndk/platforms/android-3/include/linux/textsearch.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/thread_info.h b/ndk/platforms/android-3/include/linux/thread_info.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/thread_info.h
rename to ndk/platforms/android-3/include/linux/thread_info.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/threads.h b/ndk/platforms/android-3/include/linux/threads.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/threads.h
rename to ndk/platforms/android-3/include/linux/threads.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/time.h b/ndk/platforms/android-3/include/linux/time.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/time.h
rename to ndk/platforms/android-3/include/linux/time.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/timer.h b/ndk/platforms/android-3/include/linux/timer.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/timer.h
rename to ndk/platforms/android-3/include/linux/timer.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/times.h b/ndk/platforms/android-3/include/linux/times.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/times.h
rename to ndk/platforms/android-3/include/linux/times.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/timex.h b/ndk/platforms/android-3/include/linux/timex.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/timex.h
rename to ndk/platforms/android-3/include/linux/timex.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/tiocl.h b/ndk/platforms/android-3/include/linux/tiocl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/tiocl.h
rename to ndk/platforms/android-3/include/linux/tiocl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/transport_class.h b/ndk/platforms/android-3/include/linux/transport_class.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/transport_class.h
rename to ndk/platforms/android-3/include/linux/transport_class.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/tty.h b/ndk/platforms/android-3/include/linux/tty.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/tty.h
rename to ndk/platforms/android-3/include/linux/tty.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/types.h b/ndk/platforms/android-3/include/linux/types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/types.h
rename to ndk/platforms/android-3/include/linux/types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/udp.h b/ndk/platforms/android-3/include/linux/udp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/udp.h
rename to ndk/platforms/android-3/include/linux/udp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_i.h b/ndk/platforms/android-3/include/linux/ufs_fs_i.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_i.h
rename to ndk/platforms/android-3/include/linux/ufs_fs_i.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_sb.h b/ndk/platforms/android-3/include/linux/ufs_fs_sb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/ufs_fs_sb.h
rename to ndk/platforms/android-3/include/linux/ufs_fs_sb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/uio.h b/ndk/platforms/android-3/include/linux/uio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/uio.h
rename to ndk/platforms/android-3/include/linux/uio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/un.h b/ndk/platforms/android-3/include/linux/un.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/un.h
rename to ndk/platforms/android-3/include/linux/un.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/unistd.h b/ndk/platforms/android-3/include/linux/unistd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/unistd.h
rename to ndk/platforms/android-3/include/linux/unistd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/usb.h b/ndk/platforms/android-3/include/linux/usb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/usb.h
rename to ndk/platforms/android-3/include/linux/usb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/usb_ch9.h b/ndk/platforms/android-3/include/linux/usb_ch9.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/usb_ch9.h
rename to ndk/platforms/android-3/include/linux/usb_ch9.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/usbdevice_fs.h b/ndk/platforms/android-3/include/linux/usbdevice_fs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/usbdevice_fs.h
rename to ndk/platforms/android-3/include/linux/usbdevice_fs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/user.h b/ndk/platforms/android-3/include/linux/user.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/user.h
rename to ndk/platforms/android-3/include/linux/user.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/utime.h b/ndk/platforms/android-3/include/linux/utime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/utime.h
rename to ndk/platforms/android-3/include/linux/utime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/utsname.h b/ndk/platforms/android-3/include/linux/utsname.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/utsname.h
rename to ndk/platforms/android-3/include/linux/utsname.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/version.h b/ndk/platforms/android-3/include/linux/version.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/version.h
rename to ndk/platforms/android-3/include/linux/version.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/vfs.h b/ndk/platforms/android-3/include/linux/vfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/vfs.h
rename to ndk/platforms/android-3/include/linux/vfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/videodev.h b/ndk/platforms/android-3/include/linux/videodev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/videodev.h
rename to ndk/platforms/android-3/include/linux/videodev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/videodev2.h b/ndk/platforms/android-3/include/linux/videodev2.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/videodev2.h
rename to ndk/platforms/android-3/include/linux/videodev2.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/vmalloc.h b/ndk/platforms/android-3/include/linux/vmalloc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/vmalloc.h
rename to ndk/platforms/android-3/include/linux/vmalloc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/vt.h b/ndk/platforms/android-3/include/linux/vt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/vt.h
rename to ndk/platforms/android-3/include/linux/vt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/vt_buffer.h b/ndk/platforms/android-3/include/linux/vt_buffer.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/vt_buffer.h
rename to ndk/platforms/android-3/include/linux/vt_buffer.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/wait.h b/ndk/platforms/android-3/include/linux/wait.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/wait.h
rename to ndk/platforms/android-3/include/linux/wait.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/wanrouter.h b/ndk/platforms/android-3/include/linux/wanrouter.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/wanrouter.h
rename to ndk/platforms/android-3/include/linux/wanrouter.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/wireless.h b/ndk/platforms/android-3/include/linux/wireless.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/wireless.h
rename to ndk/platforms/android-3/include/linux/wireless.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/workqueue.h b/ndk/platforms/android-3/include/linux/workqueue.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/workqueue.h
rename to ndk/platforms/android-3/include/linux/workqueue.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/xattr.h b/ndk/platforms/android-3/include/linux/xattr.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/xattr.h
rename to ndk/platforms/android-3/include/linux/xattr.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/zconf.h b/ndk/platforms/android-3/include/linux/zconf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/zconf.h
rename to ndk/platforms/android-3/include/linux/zconf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/zlib.h b/ndk/platforms/android-3/include/linux/zlib.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/zlib.h
rename to ndk/platforms/android-3/include/linux/zlib.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/linux/zorro_ids.h b/ndk/platforms/android-3/include/linux/zorro_ids.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/linux/zorro_ids.h
rename to ndk/platforms/android-3/include/linux/zorro_ids.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/locale.h b/ndk/platforms/android-3/include/locale.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/locale.h
rename to ndk/platforms/android-3/include/locale.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/malloc.h b/ndk/platforms/android-3/include/malloc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/malloc.h
rename to ndk/platforms/android-3/include/malloc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/math.h b/ndk/platforms/android-3/include/math.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/math.h
rename to ndk/platforms/android-3/include/math.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/memory.h b/ndk/platforms/android-3/include/memory.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/memory.h
rename to ndk/platforms/android-3/include/memory.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/mntent.h b/ndk/platforms/android-3/include/mntent.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/mntent.h
rename to ndk/platforms/android-3/include/mntent.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/mtd/mtd-abi.h b/ndk/platforms/android-3/include/mtd/mtd-abi.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/mtd/mtd-abi.h
rename to ndk/platforms/android-3/include/mtd/mtd-abi.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/mtd/mtd-user.h b/ndk/platforms/android-3/include/mtd/mtd-user.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/mtd/mtd-user.h
rename to ndk/platforms/android-3/include/mtd/mtd-user.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/ethertypes.h b/ndk/platforms/android-3/include/net/ethertypes.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/ethertypes.h
rename to ndk/platforms/android-3/include/net/ethertypes.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if.h b/ndk/platforms/android-3/include/net/if.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if.h
rename to ndk/platforms/android-3/include/net/if.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_arp.h b/ndk/platforms/android-3/include/net/if_arp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_arp.h
rename to ndk/platforms/android-3/include/net/if_arp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_dl.h b/ndk/platforms/android-3/include/net/if_dl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_dl.h
rename to ndk/platforms/android-3/include/net/if_dl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_ether.h b/ndk/platforms/android-3/include/net/if_ether.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_ether.h
rename to ndk/platforms/android-3/include/net/if_ether.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_ieee1394.h b/ndk/platforms/android-3/include/net/if_ieee1394.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_ieee1394.h
rename to ndk/platforms/android-3/include/net/if_ieee1394.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_packet.h b/ndk/platforms/android-3/include/net/if_packet.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_packet.h
rename to ndk/platforms/android-3/include/net/if_packet.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/if_types.h b/ndk/platforms/android-3/include/net/if_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/if_types.h
rename to ndk/platforms/android-3/include/net/if_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/net/route.h b/ndk/platforms/android-3/include/net/route.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/net/route.h
rename to ndk/platforms/android-3/include/net/route.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netdb.h b/ndk/platforms/android-3/include/netdb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netdb.h
rename to ndk/platforms/android-3/include/netdb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/ether.h b/ndk/platforms/android-3/include/netinet/ether.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/ether.h
rename to ndk/platforms/android-3/include/netinet/ether.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/if_ether.h b/ndk/platforms/android-3/include/netinet/if_ether.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/if_ether.h
rename to ndk/platforms/android-3/include/netinet/if_ether.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/in.h b/ndk/platforms/android-3/include/netinet/in.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/in.h
rename to ndk/platforms/android-3/include/netinet/in.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/in6.h b/ndk/platforms/android-3/include/netinet/in6.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/in6.h
rename to ndk/platforms/android-3/include/netinet/in6.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/in_systm.h b/ndk/platforms/android-3/include/netinet/in_systm.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/in_systm.h
rename to ndk/platforms/android-3/include/netinet/in_systm.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/ip.h b/ndk/platforms/android-3/include/netinet/ip.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/ip.h
rename to ndk/platforms/android-3/include/netinet/ip.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/ip_icmp.h b/ndk/platforms/android-3/include/netinet/ip_icmp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/ip_icmp.h
rename to ndk/platforms/android-3/include/netinet/ip_icmp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/tcp.h b/ndk/platforms/android-3/include/netinet/tcp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/tcp.h
rename to ndk/platforms/android-3/include/netinet/tcp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netinet/udp.h b/ndk/platforms/android-3/include/netinet/udp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netinet/udp.h
rename to ndk/platforms/android-3/include/netinet/udp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/netpacket/packet.h b/ndk/platforms/android-3/include/netpacket/packet.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/netpacket/packet.h
rename to ndk/platforms/android-3/include/netpacket/packet.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/nsswitch.h b/ndk/platforms/android-3/include/nsswitch.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/nsswitch.h
rename to ndk/platforms/android-3/include/nsswitch.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/pathconf.h b/ndk/platforms/android-3/include/pathconf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/pathconf.h
rename to ndk/platforms/android-3/include/pathconf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/paths.h b/ndk/platforms/android-3/include/paths.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/paths.h
rename to ndk/platforms/android-3/include/paths.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/poll.h b/ndk/platforms/android-3/include/poll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/poll.h
rename to ndk/platforms/android-3/include/poll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/pthread.h b/ndk/platforms/android-3/include/pthread.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/pthread.h
rename to ndk/platforms/android-3/include/pthread.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/pwd.h b/ndk/platforms/android-3/include/pwd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/pwd.h
rename to ndk/platforms/android-3/include/pwd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/resolv.h b/ndk/platforms/android-3/include/resolv.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/resolv.h
rename to ndk/platforms/android-3/include/resolv.h
diff --git a/ndk/platforms/android-3/include/sched.h b/ndk/platforms/android-3/include/sched.h
new file mode 100644
index 0000000..2be511b
--- /dev/null
+++ b/ndk/platforms/android-3/include/sched.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _SCHED_H_
+#define _SCHED_H_
+
+#include <sys/cdefs.h>
+#include <sys/time.h>
+
+__BEGIN_DECLS
+
+#define SCHED_NORMAL            0
+#define SCHED_OTHER             0
+#define SCHED_FIFO              1
+#define SCHED_RR                2
+
+struct sched_param {
+    int sched_priority;
+};
+
+extern int sched_setscheduler(pid_t, int, const struct sched_param *);
+extern int sched_getscheduler(pid_t);
+extern int sched_yield(void);
+extern int sched_get_priority_max(int policy);
+extern int sched_get_priority_min(int policy);
+extern int sched_setparam(pid_t, const struct sched_param *);
+extern int sched_getparam(pid_t, struct sched_param *);
+extern int sched_rr_get_interval(pid_t pid, struct timespec *tp);
+
+__END_DECLS
+
+#endif /* _SCHED_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/semaphore.h b/ndk/platforms/android-3/include/semaphore.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/semaphore.h
rename to ndk/platforms/android-3/include/semaphore.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/setjmp.h b/ndk/platforms/android-3/include/setjmp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/setjmp.h
rename to ndk/platforms/android-3/include/setjmp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sgtty.h b/ndk/platforms/android-3/include/sgtty.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sgtty.h
rename to ndk/platforms/android-3/include/sgtty.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sha1.h b/ndk/platforms/android-3/include/sha1.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sha1.h
rename to ndk/platforms/android-3/include/sha1.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/signal.h b/ndk/platforms/android-3/include/signal.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/signal.h
rename to ndk/platforms/android-3/include/signal.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/stdint.h b/ndk/platforms/android-3/include/stdint.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/stdint.h
rename to ndk/platforms/android-3/include/stdint.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/stdio.h b/ndk/platforms/android-3/include/stdio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/stdio.h
rename to ndk/platforms/android-3/include/stdio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/stdlib.h b/ndk/platforms/android-3/include/stdlib.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/stdlib.h
rename to ndk/platforms/android-3/include/stdlib.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/string.h b/ndk/platforms/android-3/include/string.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/string.h
rename to ndk/platforms/android-3/include/string.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/strings.h b/ndk/platforms/android-3/include/strings.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/strings.h
rename to ndk/platforms/android-3/include/strings.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/_errdefs.h b/ndk/platforms/android-3/include/sys/_errdefs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/_errdefs.h
rename to ndk/platforms/android-3/include/sys/_errdefs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/_sigdefs.h b/ndk/platforms/android-3/include/sys/_sigdefs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/_sigdefs.h
rename to ndk/platforms/android-3/include/sys/_sigdefs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/_system_properties.h b/ndk/platforms/android-3/include/sys/_system_properties.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/_system_properties.h
rename to ndk/platforms/android-3/include/sys/_system_properties.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/_types.h b/ndk/platforms/android-3/include/sys/_types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/_types.h
rename to ndk/platforms/android-3/include/sys/_types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/atomics.h b/ndk/platforms/android-3/include/sys/atomics.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/atomics.h
rename to ndk/platforms/android-3/include/sys/atomics.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/cdefs.h b/ndk/platforms/android-3/include/sys/cdefs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/cdefs.h
rename to ndk/platforms/android-3/include/sys/cdefs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h b/ndk/platforms/android-3/include/sys/cdefs_elf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/cdefs_elf.h
rename to ndk/platforms/android-3/include/sys/cdefs_elf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/dirent.h b/ndk/platforms/android-3/include/sys/dirent.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/dirent.h
rename to ndk/platforms/android-3/include/sys/dirent.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/endian.h b/ndk/platforms/android-3/include/sys/endian.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/endian.h
rename to ndk/platforms/android-3/include/sys/endian.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/epoll.h b/ndk/platforms/android-3/include/sys/epoll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/epoll.h
rename to ndk/platforms/android-3/include/sys/epoll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/errno.h b/ndk/platforms/android-3/include/sys/errno.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/errno.h
rename to ndk/platforms/android-3/include/sys/errno.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/exec_elf.h b/ndk/platforms/android-3/include/sys/exec_elf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/exec_elf.h
rename to ndk/platforms/android-3/include/sys/exec_elf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/file.h b/ndk/platforms/android-3/include/sys/file.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/file.h
rename to ndk/platforms/android-3/include/sys/file.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/fsuid.h b/ndk/platforms/android-3/include/sys/fsuid.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/fsuid.h
rename to ndk/platforms/android-3/include/sys/fsuid.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/inotify.h b/ndk/platforms/android-3/include/sys/inotify.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/inotify.h
rename to ndk/platforms/android-3/include/sys/inotify.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ioctl.h b/ndk/platforms/android-3/include/sys/ioctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ioctl.h
rename to ndk/platforms/android-3/include/sys/ioctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ioctl_compat.h b/ndk/platforms/android-3/include/sys/ioctl_compat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ioctl_compat.h
rename to ndk/platforms/android-3/include/sys/ioctl_compat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ipc.h b/ndk/platforms/android-3/include/sys/ipc.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ipc.h
rename to ndk/platforms/android-3/include/sys/ipc.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/klog.h b/ndk/platforms/android-3/include/sys/klog.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/klog.h
rename to ndk/platforms/android-3/include/sys/klog.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/limits.h b/ndk/platforms/android-3/include/sys/limits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/limits.h
rename to ndk/platforms/android-3/include/sys/limits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/linux-syscalls.h b/ndk/platforms/android-3/include/sys/linux-syscalls.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/linux-syscalls.h
rename to ndk/platforms/android-3/include/sys/linux-syscalls.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/linux-unistd.h b/ndk/platforms/android-3/include/sys/linux-unistd.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/linux-unistd.h
rename to ndk/platforms/android-3/include/sys/linux-unistd.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/mman.h b/ndk/platforms/android-3/include/sys/mman.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/mman.h
rename to ndk/platforms/android-3/include/sys/mman.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/mount.h b/ndk/platforms/android-3/include/sys/mount.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/mount.h
rename to ndk/platforms/android-3/include/sys/mount.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/param.h b/ndk/platforms/android-3/include/sys/param.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/param.h
rename to ndk/platforms/android-3/include/sys/param.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/poll.h b/ndk/platforms/android-3/include/sys/poll.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/poll.h
rename to ndk/platforms/android-3/include/sys/poll.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/prctl.h b/ndk/platforms/android-3/include/sys/prctl.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/prctl.h
rename to ndk/platforms/android-3/include/sys/prctl.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ptrace.h b/ndk/platforms/android-3/include/sys/ptrace.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ptrace.h
rename to ndk/platforms/android-3/include/sys/ptrace.h
diff --git a/ndk/platforms/android-8/arch-arm/usr/include/sys/queue.h b/ndk/platforms/android-3/include/sys/queue.h
similarity index 100%
rename from ndk/platforms/android-8/arch-arm/usr/include/sys/queue.h
rename to ndk/platforms/android-3/include/sys/queue.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/reboot.h b/ndk/platforms/android-3/include/sys/reboot.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/reboot.h
rename to ndk/platforms/android-3/include/sys/reboot.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/resource.h b/ndk/platforms/android-3/include/sys/resource.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/resource.h
rename to ndk/platforms/android-3/include/sys/resource.h
diff --git a/ndk/platforms/android-3/include/sys/select.h b/ndk/platforms/android-3/include/sys/select.h
new file mode 100644
index 0000000..9d11ee8
--- /dev/null
+++ b/ndk/platforms/android-3/include/sys/select.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _SYS_SELECT_H_
+#define _SYS_SELECT_H_
+
+#include <sys/cdefs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <signal.h>
+
+__BEGIN_DECLS
+
+typedef __kernel_fd_set   fd_set;
+
+extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern int pselect(int n, fd_set *readfds, fd_set *writefds, fd_set *errfds,
+                   const struct timespec *timeout, const sigset_t *sigmask);
+
+__END_DECLS
+
+#endif /* _SYS_SELECT_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/sendfile.h b/ndk/platforms/android-3/include/sys/sendfile.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/sendfile.h
rename to ndk/platforms/android-3/include/sys/sendfile.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/socket.h b/ndk/platforms/android-3/include/sys/socket.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/socket.h
rename to ndk/platforms/android-3/include/sys/socket.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/socketcalls.h b/ndk/platforms/android-3/include/sys/socketcalls.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/socketcalls.h
rename to ndk/platforms/android-3/include/sys/socketcalls.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/stat.h b/ndk/platforms/android-3/include/sys/stat.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/stat.h
rename to ndk/platforms/android-3/include/sys/stat.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/statfs.h b/ndk/platforms/android-3/include/sys/statfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/statfs.h
rename to ndk/platforms/android-3/include/sys/statfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/syscall.h b/ndk/platforms/android-3/include/sys/syscall.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/syscall.h
rename to ndk/platforms/android-3/include/sys/syscall.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/sysconf.h b/ndk/platforms/android-3/include/sys/sysconf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/sysconf.h
rename to ndk/platforms/android-3/include/sys/sysconf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/sysinfo.h b/ndk/platforms/android-3/include/sys/sysinfo.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/sysinfo.h
rename to ndk/platforms/android-3/include/sys/sysinfo.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/syslimits.h b/ndk/platforms/android-3/include/sys/syslimits.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/syslimits.h
rename to ndk/platforms/android-3/include/sys/syslimits.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h b/ndk/platforms/android-3/include/sys/sysmacros.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/sysmacros.h
rename to ndk/platforms/android-3/include/sys/sysmacros.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/system_properties.h b/ndk/platforms/android-3/include/sys/system_properties.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/system_properties.h
rename to ndk/platforms/android-3/include/sys/system_properties.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/time.h b/ndk/platforms/android-3/include/sys/time.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/time.h
rename to ndk/platforms/android-3/include/sys/time.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/timeb.h b/ndk/platforms/android-3/include/sys/timeb.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/timeb.h
rename to ndk/platforms/android-3/include/sys/timeb.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/times.h b/ndk/platforms/android-3/include/sys/times.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/times.h
rename to ndk/platforms/android-3/include/sys/times.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ttychars.h b/ndk/platforms/android-3/include/sys/ttychars.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ttychars.h
rename to ndk/platforms/android-3/include/sys/ttychars.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/ttydev.h b/ndk/platforms/android-3/include/sys/ttydev.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/ttydev.h
rename to ndk/platforms/android-3/include/sys/ttydev.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/types.h b/ndk/platforms/android-3/include/sys/types.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/types.h
rename to ndk/platforms/android-3/include/sys/types.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/uio.h b/ndk/platforms/android-3/include/sys/uio.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/uio.h
rename to ndk/platforms/android-3/include/sys/uio.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/un.h b/ndk/platforms/android-3/include/sys/un.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/un.h
rename to ndk/platforms/android-3/include/sys/un.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/utime.h b/ndk/platforms/android-3/include/sys/utime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/utime.h
rename to ndk/platforms/android-3/include/sys/utime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/utsname.h b/ndk/platforms/android-3/include/sys/utsname.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/utsname.h
rename to ndk/platforms/android-3/include/sys/utsname.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/vfs.h b/ndk/platforms/android-3/include/sys/vfs.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/vfs.h
rename to ndk/platforms/android-3/include/sys/vfs.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/vt.h b/ndk/platforms/android-3/include/sys/vt.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/vt.h
rename to ndk/platforms/android-3/include/sys/vt.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/sys/wait.h b/ndk/platforms/android-3/include/sys/wait.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/sys/wait.h
rename to ndk/platforms/android-3/include/sys/wait.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/syslog.h b/ndk/platforms/android-3/include/syslog.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/syslog.h
rename to ndk/platforms/android-3/include/syslog.h
diff --git a/ndk/platforms/android-3/include/termio.h b/ndk/platforms/android-3/include/termio.h
new file mode 100644
index 0000000..99d3630
--- /dev/null
+++ b/ndk/platforms/android-3/include/termio.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* All definitions related to termio are in Linux kernel headers
+ * that are already included by <termios.h>
+ */
+#include <termios.h>
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/termios.h b/ndk/platforms/android-3/include/termios.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/termios.h
rename to ndk/platforms/android-3/include/termios.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/thread_db.h b/ndk/platforms/android-3/include/thread_db.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/thread_db.h
rename to ndk/platforms/android-3/include/thread_db.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/time.h b/ndk/platforms/android-3/include/time.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/time.h
rename to ndk/platforms/android-3/include/time.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/time64.h b/ndk/platforms/android-3/include/time64.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/time64.h
rename to ndk/platforms/android-3/include/time64.h
diff --git a/ndk/platforms/android-3/include/unistd.h b/ndk/platforms/android-3/include/unistd.h
new file mode 100644
index 0000000..205b8dd
--- /dev/null
+++ b/ndk/platforms/android-3/include/unistd.h
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _UNISTD_H_
+#define _UNISTD_H_
+
+#include <stddef.h>
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <sys/sysconf.h>
+#include <linux/capability.h>
+#include <pathconf.h>
+
+__BEGIN_DECLS
+
+/* Standard file descriptor numbers. */
+#define STDIN_FILENO	0
+#define STDOUT_FILENO	1
+#define STDERR_FILENO	2
+
+/* Values for whence in fseek and lseek */
+#define SEEK_SET 0
+#define SEEK_CUR 1
+#define SEEK_END 2
+
+extern char **environ;
+extern __noreturn void _exit(int);
+
+extern pid_t  fork(void);
+extern pid_t  vfork(void);
+extern pid_t  getpid(void);
+extern pid_t  gettid(void);
+extern pid_t  getpgid(pid_t);
+extern int    setpgid(pid_t, pid_t);
+extern pid_t  getppid(void);
+extern pid_t  getpgrp(void);
+extern int    setpgrp(void);
+extern pid_t  setsid(void);
+extern pid_t  getsid(pid_t);
+
+extern int execv(const char *, char * const *);
+extern int execvp(const char *, char * const *);
+extern int execve(const char *, char * const *, char * const *);
+extern int execvpe(const char *, char * const *, char * const *);
+extern int execl(const char *, const char *, ...);
+extern int execlp(const char *, const char *, ...);
+extern int execle(const char *, const char *, ...);
+extern int execlpe(const char *, const char *, ...);
+extern int capget(cap_user_header_t hdrp, cap_user_data_t datap);
+extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
+extern int prctl(int  option,  unsigned long arg2, unsigned long arg3,
+                 unsigned long arg4, unsigned long arg5);
+
+extern int nice(int);
+
+extern int setuid(uid_t);
+extern uid_t getuid(void);
+extern int seteuid(uid_t);
+extern uid_t geteuid(void);
+extern int setgid(gid_t);
+extern gid_t getgid(void);
+extern int setegid(gid_t);
+extern gid_t getegid(void);
+extern int getgroups(int, gid_t *);
+extern int setgroups(size_t, const gid_t *);
+extern int setreuid(uid_t, uid_t);
+extern int setregid(gid_t, gid_t);
+extern int setresuid(uid_t, uid_t, uid_t);
+extern int setresgid(gid_t, gid_t, gid_t);
+extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
+extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
+extern int getfsuid(uid_t);
+extern int setfsuid(uid_t);
+extern int issetugid(void);
+extern char* getlogin(void);
+extern int getlogin_r(char* name, size_t namesize);
+
+
+/* Macros for access() */
+#define R_OK  4  /* Read */
+#define W_OK  2  /* Write */
+#define X_OK  1  /* Execute */
+#define F_OK  0  /* Existence */
+
+extern int access(const char *, int);
+extern int link(const char *, const char *);
+extern int unlink(const char *);
+extern int chdir(const char *);
+extern int fchdir(int);
+extern int rmdir(const char *);
+extern int pipe(int *);
+extern int chroot(const char *);
+extern int symlink(const char *, const char *);
+extern int readlink(const char *, char *, size_t);
+extern int chown(const char *, uid_t, gid_t);
+extern int fchown(int, uid_t, gid_t);
+extern int lchown(const char *, uid_t, gid_t);
+extern int truncate(const char *, off_t);
+extern char *getcwd(char *, size_t);
+
+extern int sync(void);
+
+extern int close(int);
+extern off_t lseek(int, off_t, int);
+extern loff_t lseek64(int, loff_t, int);
+
+extern ssize_t read(int, void *, size_t);
+extern ssize_t write(int, const void *, size_t);
+extern ssize_t pread(int, void *, size_t, off_t);
+extern ssize_t pwrite(int, void *, size_t, off_t);
+
+extern int dup(int);
+extern int dup2(int, int);
+extern int fcntl(int, int, ...);
+extern int ioctl(int, int, ...);
+extern int flock(int, int);
+extern int fsync(int);
+extern int fdatasync(int);
+extern int ftruncate(int, off_t);
+
+extern int pause(void);
+extern unsigned int alarm(unsigned int);
+extern unsigned int sleep(unsigned int);
+extern void usleep(unsigned long);
+
+extern int gethostname(char *, size_t);
+extern int sethostname(const char *, size_t);
+extern int getdomainname(char *, size_t);
+extern int setdomainname(const char *, size_t);
+
+extern int getdtablesize(void);
+
+extern void *__brk(void *);
+extern int brk(void *);
+extern void *sbrk(ptrdiff_t);
+
+extern int getopt(int, char * const *, const char *);
+extern char *optarg;
+extern int optind, opterr, optopt;
+
+extern int isatty(int);
+
+extern int  acct(const char*  filepath);
+
+static __inline__ int getpagesize(void) {
+  extern unsigned int __page_size;
+  return __page_size;
+}
+static __inline__ int __getpageshift(void) {
+  extern unsigned int __page_shift;
+  return __page_shift;
+}
+
+extern int sysconf(int  name);
+
+extern int daemon(int, int);
+
+/* A special syscall that is only available on the ARM, not x86 function. */
+extern int cacheflush(long start, long end, long flags);
+
+extern pid_t tcgetpgrp(int fd);
+extern int   tcsetpgrp(int fd, pid_t _pid);
+
+__END_DECLS
+
+#endif /* _UNISTD_H_ */
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/util.h b/ndk/platforms/android-3/include/util.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/util.h
rename to ndk/platforms/android-3/include/util.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/utime.h b/ndk/platforms/android-3/include/utime.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/utime.h
rename to ndk/platforms/android-3/include/utime.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/utmp.h b/ndk/platforms/android-3/include/utmp.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/utmp.h
rename to ndk/platforms/android-3/include/utmp.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/wchar.h b/ndk/platforms/android-3/include/wchar.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/wchar.h
rename to ndk/platforms/android-3/include/wchar.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/wctype.h b/ndk/platforms/android-3/include/wctype.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/wctype.h
rename to ndk/platforms/android-3/include/wctype.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/zconf.h b/ndk/platforms/android-3/include/zconf.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/zconf.h
rename to ndk/platforms/android-3/include/zconf.h
diff --git a/ndk/platforms/android-3/arch-arm/usr/include/zlib.h b/ndk/platforms/android-3/include/zlib.h
similarity index 100%
rename from ndk/platforms/android-3/arch-arm/usr/include/zlib.h
rename to ndk/platforms/android-3/include/zlib.h
diff --git a/ndk/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so b/ndk/platforms/android-4/arch-arm/lib/libGLESv1_CM.so
similarity index 100%
rename from ndk/platforms/android-4/arch-arm/usr/lib/libGLESv1_CM.so
rename to ndk/platforms/android-4/arch-arm/lib/libGLESv1_CM.so
Binary files differ
diff --git a/ndk/platforms/android-4/arch-arm/usr/include/GLES/gl.h b/ndk/platforms/android-4/include/GLES/gl.h
similarity index 100%
rename from ndk/platforms/android-4/arch-arm/usr/include/GLES/gl.h
rename to ndk/platforms/android-4/include/GLES/gl.h
diff --git a/ndk/platforms/android-4/arch-arm/usr/include/GLES/glext.h b/ndk/platforms/android-4/include/GLES/glext.h
similarity index 100%
rename from ndk/platforms/android-4/arch-arm/usr/include/GLES/glext.h
rename to ndk/platforms/android-4/include/GLES/glext.h
diff --git a/ndk/platforms/android-4/arch-arm/usr/include/GLES/glplatform.h b/ndk/platforms/android-4/include/GLES/glplatform.h
similarity index 100%
rename from ndk/platforms/android-4/arch-arm/usr/include/GLES/glplatform.h
rename to ndk/platforms/android-4/include/GLES/glplatform.h
diff --git a/ndk/platforms/android-4/arch-arm/usr/include/KHR/khrplatform.h b/ndk/platforms/android-4/include/KHR/khrplatform.h
similarity index 100%
rename from ndk/platforms/android-4/arch-arm/usr/include/KHR/khrplatform.h
rename to ndk/platforms/android-4/include/KHR/khrplatform.h
diff --git a/ndk/platforms/android-5/arch-arm/usr/lib/libGLESv2.so b/ndk/platforms/android-5/arch-arm/lib/libGLESv2.so
similarity index 100%
rename from ndk/platforms/android-5/arch-arm/usr/lib/libGLESv2.so
rename to ndk/platforms/android-5/arch-arm/lib/libGLESv2.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/a.out.h b/ndk/platforms/android-5/arch-x86/include/asm/a.out.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/a.out.h
rename to ndk/platforms/android-5/arch-x86/include/asm/a.out.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/acpi.h b/ndk/platforms/android-5/arch-x86/include/asm/acpi.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/acpi.h
rename to ndk/platforms/android-5/arch-x86/include/asm/acpi.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/acpi_32.h b/ndk/platforms/android-5/arch-x86/include/asm/acpi_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/acpi_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/acpi_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/alternative.h b/ndk/platforms/android-5/arch-x86/include/asm/alternative.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/alternative.h
rename to ndk/platforms/android-5/arch-x86/include/asm/alternative.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/alternative_32.h b/ndk/platforms/android-5/arch-x86/include/asm/alternative_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/alternative_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/alternative_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/apic.h b/ndk/platforms/android-5/arch-x86/include/asm/apic.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/apic.h
rename to ndk/platforms/android-5/arch-x86/include/asm/apic.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/apic_32.h b/ndk/platforms/android-5/arch-x86/include/asm/apic_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/apic_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/apic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/apicdef.h b/ndk/platforms/android-5/arch-x86/include/asm/apicdef.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/apicdef.h
rename to ndk/platforms/android-5/arch-x86/include/asm/apicdef.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/apicdef_32.h b/ndk/platforms/android-5/arch-x86/include/asm/apicdef_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/apicdef_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/apicdef_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/atomic.h b/ndk/platforms/android-5/arch-x86/include/asm/atomic.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/atomic.h
rename to ndk/platforms/android-5/arch-x86/include/asm/atomic.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/atomic_32.h b/ndk/platforms/android-5/arch-x86/include/asm/atomic_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/atomic_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/atomic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/auxvec.h b/ndk/platforms/android-5/arch-x86/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/auxvec.h
rename to ndk/platforms/android-5/arch-x86/include/asm/auxvec.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/bitops.h b/ndk/platforms/android-5/arch-x86/include/asm/bitops.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/bitops.h
rename to ndk/platforms/android-5/arch-x86/include/asm/bitops.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/bitops_32.h b/ndk/platforms/android-5/arch-x86/include/asm/bitops_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/bitops_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/bitops_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/bug.h b/ndk/platforms/android-5/arch-x86/include/asm/bug.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/bug.h
rename to ndk/platforms/android-5/arch-x86/include/asm/bug.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/byteorder.h b/ndk/platforms/android-5/arch-x86/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/byteorder.h
rename to ndk/platforms/android-5/arch-x86/include/asm/byteorder.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cache.h b/ndk/platforms/android-5/arch-x86/include/asm/cache.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cache.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cache.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cacheflush.h b/ndk/platforms/android-5/arch-x86/include/asm/cacheflush.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cacheflush.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cacheflush.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cmpxchg.h b/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cmpxchg.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cmpxchg.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cmpxchg_32.h b/ndk/platforms/android-5/arch-x86/include/asm/cmpxchg_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cmpxchg_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cmpxchg_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cpufeature.h b/ndk/platforms/android-5/arch-x86/include/asm/cpufeature.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cpufeature.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cpufeature.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cpufeature_32.h b/ndk/platforms/android-5/arch-x86/include/asm/cpufeature_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cpufeature_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cpufeature_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/cputime.h b/ndk/platforms/android-5/arch-x86/include/asm/cputime.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/cputime.h
rename to ndk/platforms/android-5/arch-x86/include/asm/cputime.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/current.h b/ndk/platforms/android-5/arch-x86/include/asm/current.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/current.h
rename to ndk/platforms/android-5/arch-x86/include/asm/current.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/current_32.h b/ndk/platforms/android-5/arch-x86/include/asm/current_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/current_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/current_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/delay.h b/ndk/platforms/android-5/arch-x86/include/asm/delay.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/delay.h
rename to ndk/platforms/android-5/arch-x86/include/asm/delay.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/desc.h b/ndk/platforms/android-5/arch-x86/include/asm/desc.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/desc.h
rename to ndk/platforms/android-5/arch-x86/include/asm/desc.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/desc_32.h b/ndk/platforms/android-5/arch-x86/include/asm/desc_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/desc_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/desc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/desc_defs.h b/ndk/platforms/android-5/arch-x86/include/asm/desc_defs.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/desc_defs.h
rename to ndk/platforms/android-5/arch-x86/include/asm/desc_defs.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/div64.h b/ndk/platforms/android-5/arch-x86/include/asm/div64.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/div64.h
rename to ndk/platforms/android-5/arch-x86/include/asm/div64.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dma-mapping.h b/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dma-mapping.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dma-mapping.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dma-mapping_32.h b/ndk/platforms/android-5/arch-x86/include/asm/dma-mapping_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dma-mapping_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dma-mapping_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dma.h b/ndk/platforms/android-5/arch-x86/include/asm/dma.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dma.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dma.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dma_32.h b/ndk/platforms/android-5/arch-x86/include/asm/dma_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dma_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dma_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dwarf2.h b/ndk/platforms/android-5/arch-x86/include/asm/dwarf2.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dwarf2.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dwarf2.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/dwarf2_32.h b/ndk/platforms/android-5/arch-x86/include/asm/dwarf2_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/dwarf2_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/dwarf2_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/e820.h b/ndk/platforms/android-5/arch-x86/include/asm/e820.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/e820.h
rename to ndk/platforms/android-5/arch-x86/include/asm/e820.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/elf.h b/ndk/platforms/android-5/arch-x86/include/asm/elf.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/elf.h
rename to ndk/platforms/android-5/arch-x86/include/asm/elf.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/errno.h b/ndk/platforms/android-5/arch-x86/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/errno.h
rename to ndk/platforms/android-5/arch-x86/include/asm/errno.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/fcntl.h b/ndk/platforms/android-5/arch-x86/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/fcntl.h
rename to ndk/platforms/android-5/arch-x86/include/asm/fcntl.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/fixmap.h b/ndk/platforms/android-5/arch-x86/include/asm/fixmap.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/fixmap.h
rename to ndk/platforms/android-5/arch-x86/include/asm/fixmap.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/fixmap_32.h b/ndk/platforms/android-5/arch-x86/include/asm/fixmap_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/fixmap_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/fixmap_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/genapic.h b/ndk/platforms/android-5/arch-x86/include/asm/genapic.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/genapic.h
rename to ndk/platforms/android-5/arch-x86/include/asm/genapic.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/genapic_32.h b/ndk/platforms/android-5/arch-x86/include/asm/genapic_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/genapic_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/genapic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/hardirq.h b/ndk/platforms/android-5/arch-x86/include/asm/hardirq.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/hardirq.h
rename to ndk/platforms/android-5/arch-x86/include/asm/hardirq.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/hardirq_32.h b/ndk/platforms/android-5/arch-x86/include/asm/hardirq_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/hardirq_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/hardirq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/highmem.h b/ndk/platforms/android-5/arch-x86/include/asm/highmem.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/highmem.h
rename to ndk/platforms/android-5/arch-x86/include/asm/highmem.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/hw_irq.h b/ndk/platforms/android-5/arch-x86/include/asm/hw_irq.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/hw_irq.h
rename to ndk/platforms/android-5/arch-x86/include/asm/hw_irq.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/hw_irq_32.h b/ndk/platforms/android-5/arch-x86/include/asm/hw_irq_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/hw_irq_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/hw_irq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/i387.h b/ndk/platforms/android-5/arch-x86/include/asm/i387.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/i387.h
rename to ndk/platforms/android-5/arch-x86/include/asm/i387.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/i387_32.h b/ndk/platforms/android-5/arch-x86/include/asm/i387_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/i387_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/i387_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/i8253.h b/ndk/platforms/android-5/arch-x86/include/asm/i8253.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/i8253.h
rename to ndk/platforms/android-5/arch-x86/include/asm/i8253.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/i8259.h b/ndk/platforms/android-5/arch-x86/include/asm/i8259.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/i8259.h
rename to ndk/platforms/android-5/arch-x86/include/asm/i8259.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ia32_unistd.h b/ndk/platforms/android-5/arch-x86/include/asm/ia32_unistd.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ia32_unistd.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ia32_unistd.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/io.h b/ndk/platforms/android-5/arch-x86/include/asm/io.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/io.h
rename to ndk/platforms/android-5/arch-x86/include/asm/io.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/io_32.h b/ndk/platforms/android-5/arch-x86/include/asm/io_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/io_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/io_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/io_apic.h b/ndk/platforms/android-5/arch-x86/include/asm/io_apic.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/io_apic.h
rename to ndk/platforms/android-5/arch-x86/include/asm/io_apic.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/io_apic_32.h b/ndk/platforms/android-5/arch-x86/include/asm/io_apic_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/io_apic_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/io_apic_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ioctl.h b/ndk/platforms/android-5/arch-x86/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ioctl.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ioctl.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ioctls.h b/ndk/platforms/android-5/arch-x86/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ioctls.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ioctls.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ipcbuf.h b/ndk/platforms/android-5/arch-x86/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ipcbuf.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/irq.h b/ndk/platforms/android-5/arch-x86/include/asm/irq.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/irq.h
rename to ndk/platforms/android-5/arch-x86/include/asm/irq.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/irq_32.h b/ndk/platforms/android-5/arch-x86/include/asm/irq_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/irq_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/irq_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/irqflags.h b/ndk/platforms/android-5/arch-x86/include/asm/irqflags.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/irqflags.h
rename to ndk/platforms/android-5/arch-x86/include/asm/irqflags.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/irqflags_32.h b/ndk/platforms/android-5/arch-x86/include/asm/irqflags_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/irqflags_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/irqflags_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ist.h b/ndk/platforms/android-5/arch-x86/include/asm/ist.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ist.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ist.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/kmap_types.h b/ndk/platforms/android-5/arch-x86/include/asm/kmap_types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/kmap_types.h
rename to ndk/platforms/android-5/arch-x86/include/asm/kmap_types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ldt.h b/ndk/platforms/android-5/arch-x86/include/asm/ldt.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ldt.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ldt.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/linkage.h b/ndk/platforms/android-5/arch-x86/include/asm/linkage.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/linkage.h
rename to ndk/platforms/android-5/arch-x86/include/asm/linkage.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/linkage_32.h b/ndk/platforms/android-5/arch-x86/include/asm/linkage_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/linkage_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/linkage_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/local.h b/ndk/platforms/android-5/arch-x86/include/asm/local.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/local.h
rename to ndk/platforms/android-5/arch-x86/include/asm/local.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/local_32.h b/ndk/platforms/android-5/arch-x86/include/asm/local_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/local_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/local_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/math_emu.h b/ndk/platforms/android-5/arch-x86/include/asm/math_emu.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/math_emu.h
rename to ndk/platforms/android-5/arch-x86/include/asm/math_emu.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mc146818rtc.h b/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mc146818rtc.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mc146818rtc_32.h b/ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mc146818rtc_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mc146818rtc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mman.h b/ndk/platforms/android-5/arch-x86/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mman.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mman.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mmsegment.h b/ndk/platforms/android-5/arch-x86/include/asm/mmsegment.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mmsegment.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mmsegment.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mmu.h b/ndk/platforms/android-5/arch-x86/include/asm/mmu.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mmu.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mmu.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/module.h b/ndk/platforms/android-5/arch-x86/include/asm/module.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/module.h
rename to ndk/platforms/android-5/arch-x86/include/asm/module.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/module_32.h b/ndk/platforms/android-5/arch-x86/include/asm/module_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/module_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/module_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec.h b/ndk/platforms/android-5/arch-x86/include/asm/mpspec.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mpspec.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec_32.h b/ndk/platforms/android-5/arch-x86/include/asm/mpspec_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mpspec_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec_def.h b/ndk/platforms/android-5/arch-x86/include/asm/mpspec_def.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/mpspec_def.h
rename to ndk/platforms/android-5/arch-x86/include/asm/mpspec_def.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/msgbuf.h b/ndk/platforms/android-5/arch-x86/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/msgbuf.h
rename to ndk/platforms/android-5/arch-x86/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/msr-index.h b/ndk/platforms/android-5/arch-x86/include/asm/msr-index.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/msr-index.h
rename to ndk/platforms/android-5/arch-x86/include/asm/msr-index.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/msr.h b/ndk/platforms/android-5/arch-x86/include/asm/msr.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/msr.h
rename to ndk/platforms/android-5/arch-x86/include/asm/msr.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/page.h b/ndk/platforms/android-5/arch-x86/include/asm/page.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/page.h
rename to ndk/platforms/android-5/arch-x86/include/asm/page.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/page_32.h b/ndk/platforms/android-5/arch-x86/include/asm/page_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/page_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/page_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/param.h b/ndk/platforms/android-5/arch-x86/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/param.h
rename to ndk/platforms/android-5/arch-x86/include/asm/param.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/paravirt.h b/ndk/platforms/android-5/arch-x86/include/asm/paravirt.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/paravirt.h
rename to ndk/platforms/android-5/arch-x86/include/asm/paravirt.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pda.h b/ndk/platforms/android-5/arch-x86/include/asm/pda.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pda.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pda.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/percpu.h b/ndk/platforms/android-5/arch-x86/include/asm/percpu.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/percpu.h
rename to ndk/platforms/android-5/arch-x86/include/asm/percpu.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/percpu_32.h b/ndk/platforms/android-5/arch-x86/include/asm/percpu_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/percpu_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/percpu_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgalloc.h b/ndk/platforms/android-5/arch-x86/include/asm/pgalloc.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgalloc.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgalloc.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgalloc_32.h b/ndk/platforms/android-5/arch-x86/include/asm/pgalloc_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgalloc_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgalloc_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable-2level-defs.h b/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level-defs.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable-2level-defs.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level-defs.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable-2level.h b/ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable-2level.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgtable-2level.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable.h b/ndk/platforms/android-5/arch-x86/include/asm/pgtable.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgtable.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable_32.h b/ndk/platforms/android-5/arch-x86/include/asm/pgtable_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/pgtable_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/pgtable_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/poll.h b/ndk/platforms/android-5/arch-x86/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/poll.h
rename to ndk/platforms/android-5/arch-x86/include/asm/poll.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/posix_types.h b/ndk/platforms/android-5/arch-x86/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/posix_types.h
rename to ndk/platforms/android-5/arch-x86/include/asm/posix_types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/posix_types_32.h b/ndk/platforms/android-5/arch-x86/include/asm/posix_types_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/posix_types_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/posix_types_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/prctl.h b/ndk/platforms/android-5/arch-x86/include/asm/prctl.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/prctl.h
rename to ndk/platforms/android-5/arch-x86/include/asm/prctl.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/processor-flags.h b/ndk/platforms/android-5/arch-x86/include/asm/processor-flags.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/processor-flags.h
rename to ndk/platforms/android-5/arch-x86/include/asm/processor-flags.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/processor.h b/ndk/platforms/android-5/arch-x86/include/asm/processor.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/processor.h
rename to ndk/platforms/android-5/arch-x86/include/asm/processor.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/processor_32.h b/ndk/platforms/android-5/arch-x86/include/asm/processor_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/processor_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/processor_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ptrace-abi.h b/ndk/platforms/android-5/arch-x86/include/asm/ptrace-abi.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ptrace-abi.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ptrace-abi.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/ptrace.h b/ndk/platforms/android-5/arch-x86/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/ptrace.h
rename to ndk/platforms/android-5/arch-x86/include/asm/ptrace.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/required-features.h b/ndk/platforms/android-5/arch-x86/include/asm/required-features.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/required-features.h
rename to ndk/platforms/android-5/arch-x86/include/asm/required-features.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/resource.h b/ndk/platforms/android-5/arch-x86/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/resource.h
rename to ndk/platforms/android-5/arch-x86/include/asm/resource.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/rwlock.h b/ndk/platforms/android-5/arch-x86/include/asm/rwlock.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/rwlock.h
rename to ndk/platforms/android-5/arch-x86/include/asm/rwlock.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/scatterlist.h b/ndk/platforms/android-5/arch-x86/include/asm/scatterlist.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/scatterlist.h
rename to ndk/platforms/android-5/arch-x86/include/asm/scatterlist.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/scatterlist_32.h b/ndk/platforms/android-5/arch-x86/include/asm/scatterlist_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/scatterlist_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/scatterlist_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/sections.h b/ndk/platforms/android-5/arch-x86/include/asm/sections.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/sections.h
rename to ndk/platforms/android-5/arch-x86/include/asm/sections.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/segment.h b/ndk/platforms/android-5/arch-x86/include/asm/segment.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/segment.h
rename to ndk/platforms/android-5/arch-x86/include/asm/segment.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/segment_32.h b/ndk/platforms/android-5/arch-x86/include/asm/segment_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/segment_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/segment_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/semaphore.h b/ndk/platforms/android-5/arch-x86/include/asm/semaphore.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/semaphore.h
rename to ndk/platforms/android-5/arch-x86/include/asm/semaphore.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/semaphore_32.h b/ndk/platforms/android-5/arch-x86/include/asm/semaphore_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/semaphore_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/semaphore_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/sembuf.h b/ndk/platforms/android-5/arch-x86/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/sembuf.h
rename to ndk/platforms/android-5/arch-x86/include/asm/sembuf.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/setup.h b/ndk/platforms/android-5/arch-x86/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/setup.h
rename to ndk/platforms/android-5/arch-x86/include/asm/setup.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/shmbuf.h b/ndk/platforms/android-5/arch-x86/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/shmbuf.h
rename to ndk/platforms/android-5/arch-x86/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/shmparam.h b/ndk/platforms/android-5/arch-x86/include/asm/shmparam.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/shmparam.h
rename to ndk/platforms/android-5/arch-x86/include/asm/shmparam.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/sigcontext.h b/ndk/platforms/android-5/arch-x86/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/sigcontext.h
rename to ndk/platforms/android-5/arch-x86/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/siginfo.h b/ndk/platforms/android-5/arch-x86/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/siginfo.h
rename to ndk/platforms/android-5/arch-x86/include/asm/siginfo.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/signal.h b/ndk/platforms/android-5/arch-x86/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/signal.h
rename to ndk/platforms/android-5/arch-x86/include/asm/signal.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/smp.h b/ndk/platforms/android-5/arch-x86/include/asm/smp.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/smp.h
rename to ndk/platforms/android-5/arch-x86/include/asm/smp.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/smp_32.h b/ndk/platforms/android-5/arch-x86/include/asm/smp_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/smp_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/smp_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/socket.h b/ndk/platforms/android-5/arch-x86/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/socket.h
rename to ndk/platforms/android-5/arch-x86/include/asm/socket.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/sockios.h b/ndk/platforms/android-5/arch-x86/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/sockios.h
rename to ndk/platforms/android-5/arch-x86/include/asm/sockios.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock.h b/ndk/platforms/android-5/arch-x86/include/asm/spinlock.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock.h
rename to ndk/platforms/android-5/arch-x86/include/asm/spinlock.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock_32.h b/ndk/platforms/android-5/arch-x86/include/asm/spinlock_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/spinlock_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock_types.h b/ndk/platforms/android-5/arch-x86/include/asm/spinlock_types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/spinlock_types.h
rename to ndk/platforms/android-5/arch-x86/include/asm/spinlock_types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/stat.h b/ndk/platforms/android-5/arch-x86/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/stat.h
rename to ndk/platforms/android-5/arch-x86/include/asm/stat.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/statfs.h b/ndk/platforms/android-5/arch-x86/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/statfs.h
rename to ndk/platforms/android-5/arch-x86/include/asm/statfs.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/string.h b/ndk/platforms/android-5/arch-x86/include/asm/string.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/string.h
rename to ndk/platforms/android-5/arch-x86/include/asm/string.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/string_32.h b/ndk/platforms/android-5/arch-x86/include/asm/string_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/string_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/string_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/swiotlb.h b/ndk/platforms/android-5/arch-x86/include/asm/swiotlb.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/swiotlb.h
rename to ndk/platforms/android-5/arch-x86/include/asm/swiotlb.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/system.h b/ndk/platforms/android-5/arch-x86/include/asm/system.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/system.h
rename to ndk/platforms/android-5/arch-x86/include/asm/system.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/system_32.h b/ndk/platforms/android-5/arch-x86/include/asm/system_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/system_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/system_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/termbits.h b/ndk/platforms/android-5/arch-x86/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/termbits.h
rename to ndk/platforms/android-5/arch-x86/include/asm/termbits.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/termios.h b/ndk/platforms/android-5/arch-x86/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/termios.h
rename to ndk/platforms/android-5/arch-x86/include/asm/termios.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/thread_info.h b/ndk/platforms/android-5/arch-x86/include/asm/thread_info.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/thread_info.h
rename to ndk/platforms/android-5/arch-x86/include/asm/thread_info.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/thread_info_32.h b/ndk/platforms/android-5/arch-x86/include/asm/thread_info_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/thread_info_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/thread_info_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/tlbflush.h b/ndk/platforms/android-5/arch-x86/include/asm/tlbflush.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/tlbflush.h
rename to ndk/platforms/android-5/arch-x86/include/asm/tlbflush.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/tlbflush_32.h b/ndk/platforms/android-5/arch-x86/include/asm/tlbflush_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/tlbflush_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/tlbflush_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/tsc.h b/ndk/platforms/android-5/arch-x86/include/asm/tsc.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/tsc.h
rename to ndk/platforms/android-5/arch-x86/include/asm/tsc.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/types.h b/ndk/platforms/android-5/arch-x86/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/types.h
rename to ndk/platforms/android-5/arch-x86/include/asm/types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/uaccess.h b/ndk/platforms/android-5/arch-x86/include/asm/uaccess.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/uaccess.h
rename to ndk/platforms/android-5/arch-x86/include/asm/uaccess.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/uaccess_32.h b/ndk/platforms/android-5/arch-x86/include/asm/uaccess_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/uaccess_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/uaccess_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/unaligned.h b/ndk/platforms/android-5/arch-x86/include/asm/unaligned.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/unaligned.h
rename to ndk/platforms/android-5/arch-x86/include/asm/unaligned.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/unistd.h b/ndk/platforms/android-5/arch-x86/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/unistd.h
rename to ndk/platforms/android-5/arch-x86/include/asm/unistd.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/unistd_32.h b/ndk/platforms/android-5/arch-x86/include/asm/unistd_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/unistd_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/unistd_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/user.h b/ndk/platforms/android-5/arch-x86/include/asm/user.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/user.h
rename to ndk/platforms/android-5/arch-x86/include/asm/user.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/user32.h b/ndk/platforms/android-5/arch-x86/include/asm/user32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/user32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/user32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/user_32.h b/ndk/platforms/android-5/arch-x86/include/asm/user_32.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/user_32.h
rename to ndk/platforms/android-5/arch-x86/include/asm/user_32.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/vm86.h b/ndk/platforms/android-5/arch-x86/include/asm/vm86.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/vm86.h
rename to ndk/platforms/android-5/arch-x86/include/asm/vm86.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/voyager.h b/ndk/platforms/android-5/arch-x86/include/asm/voyager.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/voyager.h
rename to ndk/platforms/android-5/arch-x86/include/asm/voyager.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/vsyscall.h b/ndk/platforms/android-5/arch-x86/include/asm/vsyscall.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/vsyscall.h
rename to ndk/platforms/android-5/arch-x86/include/asm/vsyscall.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm/xen/hypercall.h b/ndk/platforms/android-5/arch-x86/include/asm/xen/hypercall.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/asm/xen/hypercall.h
rename to ndk/platforms/android-5/arch-x86/include/asm/xen/hypercall.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/endian.h b/ndk/platforms/android-5/arch-x86/include/endian.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/endian.h
rename to ndk/platforms/android-5/arch-x86/include/endian.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/fenv.h b/ndk/platforms/android-5/arch-x86/include/fenv.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/fenv.h
rename to ndk/platforms/android-5/arch-x86/include/fenv.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/_types.h b/ndk/platforms/android-5/arch-x86/include/machine/_types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/_types.h
rename to ndk/platforms/android-5/arch-x86/include/machine/_types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/asm.h b/ndk/platforms/android-5/arch-x86/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/asm.h
rename to ndk/platforms/android-5/arch-x86/include/machine/asm.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/cdefs.h b/ndk/platforms/android-5/arch-x86/include/machine/cdefs.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/cdefs.h
rename to ndk/platforms/android-5/arch-x86/include/machine/cdefs.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/exec.h b/ndk/platforms/android-5/arch-x86/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/exec.h
rename to ndk/platforms/android-5/arch-x86/include/machine/exec.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/ieee.h b/ndk/platforms/android-5/arch-x86/include/machine/ieee.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/ieee.h
rename to ndk/platforms/android-5/arch-x86/include/machine/ieee.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/internal_types.h b/ndk/platforms/android-5/arch-x86/include/machine/internal_types.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/internal_types.h
rename to ndk/platforms/android-5/arch-x86/include/machine/internal_types.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/kernel.h b/ndk/platforms/android-5/arch-x86/include/machine/kernel.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/kernel.h
rename to ndk/platforms/android-5/arch-x86/include/machine/kernel.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/limits.h b/ndk/platforms/android-5/arch-x86/include/machine/limits.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/limits.h
rename to ndk/platforms/android-5/arch-x86/include/machine/limits.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/machine/setjmp.h b/ndk/platforms/android-5/arch-x86/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/include/machine/setjmp.h
rename to ndk/platforms/android-5/arch-x86/include/machine/setjmp.h
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/crtbegin_dynamic.o b/ndk/platforms/android-5/arch-x86/lib/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/crtbegin_dynamic.o
rename to ndk/platforms/android-5/arch-x86/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/crtbegin_static.o b/ndk/platforms/android-5/arch-x86/lib/crtbegin_static.o
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/crtbegin_static.o
rename to ndk/platforms/android-5/arch-x86/lib/crtbegin_static.o
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/crtend_android.o b/ndk/platforms/android-5/arch-x86/lib/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/crtend_android.o
rename to ndk/platforms/android-5/arch-x86/lib/crtend_android.o
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libc.a b/ndk/platforms/android-5/arch-x86/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libc.a
rename to ndk/platforms/android-5/arch-x86/lib/libc.a
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libc.so b/ndk/platforms/android-5/arch-x86/lib/libc.so
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libc.so
rename to ndk/platforms/android-5/arch-x86/lib/libc.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libc_common.a b/ndk/platforms/android-5/arch-x86/lib/libc_common.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libc_common.a
rename to ndk/platforms/android-5/arch-x86/lib/libc_common.a
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libdl.so b/ndk/platforms/android-5/arch-x86/lib/libdl.so
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libdl.so
rename to ndk/platforms/android-5/arch-x86/lib/libdl.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libm.a b/ndk/platforms/android-5/arch-x86/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libm.a
rename to ndk/platforms/android-5/arch-x86/lib/libm.a
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libm.so b/ndk/platforms/android-5/arch-x86/lib/libm.so
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libm.so
rename to ndk/platforms/android-5/arch-x86/lib/libm.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libstdc++.a b/ndk/platforms/android-5/arch-x86/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libstdc++.a
rename to ndk/platforms/android-5/arch-x86/lib/libstdc++.a
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libstdc++.so b/ndk/platforms/android-5/arch-x86/lib/libstdc++.so
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libstdc++.so
rename to ndk/platforms/android-5/arch-x86/lib/libstdc++.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libthread_db.a b/ndk/platforms/android-5/arch-x86/lib/libthread_db.a
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libthread_db.a
rename to ndk/platforms/android-5/arch-x86/lib/libthread_db.a
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/lib/libthread_db.so b/ndk/platforms/android-5/arch-x86/lib/libthread_db.so
similarity index 100%
rename from ndk/platforms/android-5/arch-x86/usr/lib/libthread_db.so
rename to ndk/platforms/android-5/arch-x86/lib/libthread_db.so
Binary files differ
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES/gl.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES/gl.h
deleted file mode 100644
index 2e8b971..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES/gl.h
+++ /dev/null
@@ -1,769 +0,0 @@
-#ifndef __gl_h_
-#define __gl_h_
-
-/* $Revision: 7172 $ on $Date:: 2009-01-09 11:17:41 -0800 #$ */
-
-#include <GLES/glplatform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-typedef void             GLvoid;
-typedef unsigned int     GLenum;
-typedef unsigned char    GLboolean;
-typedef unsigned int     GLbitfield;
-typedef khronos_int8_t   GLbyte;
-typedef short            GLshort;
-typedef int              GLint;
-typedef int              GLsizei;
-typedef khronos_uint8_t  GLubyte;
-typedef unsigned short   GLushort;
-typedef unsigned int     GLuint;
-typedef khronos_float_t  GLfloat;
-typedef khronos_float_t  GLclampf;
-typedef khronos_int32_t  GLfixed;
-typedef khronos_int32_t  GLclampx;
-
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
-
-
-/*************************************************************/
-
-/* OpenGL ES core versions */
-#define GL_VERSION_ES_CM_1_0          1
-#define GL_VERSION_ES_CL_1_0          1
-#define GL_VERSION_ES_CM_1_1          1
-#define GL_VERSION_ES_CL_1_1          1
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* ClipPlaneName */
-#define GL_CLIP_PLANE0                    0x3000
-#define GL_CLIP_PLANE1                    0x3001
-#define GL_CLIP_PLANE2                    0x3002
-#define GL_CLIP_PLANE3                    0x3003
-#define GL_CLIP_PLANE4                    0x3004
-#define GL_CLIP_PLANE5                    0x3005
-
-/* ColorMaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* ColorMaterialParameter */
-/*      GL_AMBIENT_AND_DIFFUSE */
-
-/* ColorPointerType */
-/*      GL_UNSIGNED_BYTE */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* CullFaceMode */
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_FOG                            0x0B60
-#define GL_LIGHTING                       0x0B50
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_ALPHA_TEST                     0x0BC0
-#define GL_BLEND                          0x0BE2
-#define GL_COLOR_LOGIC_OP                 0x0BF2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-/*      GL_LIGHT0 */
-/*      GL_LIGHT1 */
-/*      GL_LIGHT2 */
-/*      GL_LIGHT3 */
-/*      GL_LIGHT4 */
-/*      GL_LIGHT5 */
-/*      GL_LIGHT6 */
-/*      GL_LIGHT7 */
-#define GL_POINT_SMOOTH                   0x0B10
-#define GL_LINE_SMOOTH                    0x0B20
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_MATERIAL                 0x0B57
-#define GL_NORMALIZE                      0x0BA1
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_VERTEX_ARRAY                   0x8074
-#define GL_NORMAL_ARRAY                   0x8075
-#define GL_COLOR_ARRAY                    0x8076
-#define GL_TEXTURE_COORD_ARRAY            0x8078
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_STACK_OVERFLOW                 0x0503
-#define GL_STACK_UNDERFLOW                0x0504
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FogMode */
-/*      GL_LINEAR */
-#define GL_EXP                            0x0800
-#define GL_EXP2                           0x0801
-
-/* FogParameter */
-#define GL_FOG_DENSITY                    0x0B62
-#define GL_FOG_START                      0x0B63
-#define GL_FOG_END                        0x0B64
-#define GL_FOG_MODE                       0x0B65
-#define GL_FOG_COLOR                      0x0B66
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetPName */
-#define GL_CURRENT_COLOR                  0x0B00
-#define GL_CURRENT_NORMAL                 0x0B02
-#define GL_CURRENT_TEXTURE_COORDS         0x0B03
-#define GL_POINT_SIZE                     0x0B11
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_SHADE_MODEL                    0x0B54
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_MATRIX_MODE                    0x0BA0
-#define GL_VIEWPORT                       0x0BA2
-#define GL_MODELVIEW_STACK_DEPTH          0x0BA3
-#define GL_PROJECTION_STACK_DEPTH         0x0BA4
-#define GL_TEXTURE_STACK_DEPTH            0x0BA5
-#define GL_MODELVIEW_MATRIX               0x0BA6
-#define GL_PROJECTION_MATRIX              0x0BA7
-#define GL_TEXTURE_MATRIX                 0x0BA8
-#define GL_ALPHA_TEST_FUNC                0x0BC1
-#define GL_ALPHA_TEST_REF                 0x0BC2
-#define GL_BLEND_DST                      0x0BE0
-#define GL_BLEND_SRC                      0x0BE1
-#define GL_LOGIC_OP_MODE                  0x0BF0
-#define GL_SCISSOR_BOX                    0x0C10
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_LIGHTS                     0x0D31
-#define GL_MAX_CLIP_PLANES                0x0D32
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_MODELVIEW_STACK_DEPTH      0x0D36
-#define GL_MAX_PROJECTION_STACK_DEPTH     0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH        0x0D39
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_VERTEX_ARRAY_SIZE              0x807A
-#define GL_VERTEX_ARRAY_TYPE              0x807B
-#define GL_VERTEX_ARRAY_STRIDE            0x807C
-#define GL_NORMAL_ARRAY_TYPE              0x807E
-#define GL_NORMAL_ARRAY_STRIDE            0x807F
-#define GL_COLOR_ARRAY_SIZE               0x8081
-#define GL_COLOR_ARRAY_TYPE               0x8082
-#define GL_COLOR_ARRAY_STRIDE             0x8083
-#define GL_TEXTURE_COORD_ARRAY_SIZE       0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE       0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE     0x808A
-#define GL_VERTEX_ARRAY_POINTER           0x808E
-#define GL_NORMAL_ARRAY_POINTER           0x808F
-#define GL_COLOR_ARRAY_POINTER            0x8090
-#define GL_TEXTURE_COORD_ARRAY_POINTER    0x8092
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_PERSPECTIVE_CORRECTION_HINT    0x0C50
-#define GL_POINT_SMOOTH_HINT              0x0C51
-#define GL_LINE_SMOOTH_HINT               0x0C52
-#define GL_FOG_HINT                       0x0C54
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-
-/* LightModelParameter */
-#define GL_LIGHT_MODEL_AMBIENT            0x0B53
-#define GL_LIGHT_MODEL_TWO_SIDE           0x0B52
-
-/* LightParameter */
-#define GL_AMBIENT                        0x1200
-#define GL_DIFFUSE                        0x1201
-#define GL_SPECULAR                       0x1202
-#define GL_POSITION                       0x1203
-#define GL_SPOT_DIRECTION                 0x1204
-#define GL_SPOT_EXPONENT                  0x1205
-#define GL_SPOT_CUTOFF                    0x1206
-#define GL_CONSTANT_ATTENUATION           0x1207
-#define GL_LINEAR_ATTENUATION             0x1208
-#define GL_QUADRATIC_ATTENUATION          0x1209
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-
-/* LogicOp */
-#define GL_CLEAR                          0x1500
-#define GL_AND                            0x1501
-#define GL_AND_REVERSE                    0x1502
-#define GL_COPY                           0x1503
-#define GL_AND_INVERTED                   0x1504
-#define GL_NOOP                           0x1505
-#define GL_XOR                            0x1506
-#define GL_OR                             0x1507
-#define GL_NOR                            0x1508
-#define GL_EQUIV                          0x1509
-#define GL_INVERT                         0x150A
-#define GL_OR_REVERSE                     0x150B
-#define GL_COPY_INVERTED                  0x150C
-#define GL_OR_INVERTED                    0x150D
-#define GL_NAND                           0x150E
-#define GL_SET                            0x150F
-
-/* MaterialFace */
-/*      GL_FRONT_AND_BACK */
-
-/* MaterialParameter */
-#define GL_EMISSION                       0x1600
-#define GL_SHININESS                      0x1601
-#define GL_AMBIENT_AND_DIFFUSE            0x1602
-/*      GL_AMBIENT */
-/*      GL_DIFFUSE */
-/*      GL_SPECULAR */
-
-/* MatrixMode */
-#define GL_MODELVIEW                      0x1700
-#define GL_PROJECTION                     0x1701
-#define GL_TEXTURE                        0x1702
-
-/* NormalPointerType */
-/*      GL_BYTE */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-
-/* PixelFormat */
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelStoreParameter */
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* ShadingModel */
-#define GL_FLAT                           0x1D00
-#define GL_SMOOTH                         0x1D01
-
-/* StencilFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-/*      GL_INVERT */
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TexCoordPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* TextureEnvMode */
-#define GL_MODULATE                       0x2100
-#define GL_DECAL                          0x2101
-/*      GL_BLEND */
-#define GL_ADD                            0x0104
-/*      GL_REPLACE */
-
-/* TextureEnvParameter */
-#define GL_TEXTURE_ENV_MODE               0x2200
-#define GL_TEXTURE_ENV_COLOR              0x2201
-
-/* TextureEnvTarget */
-#define GL_TEXTURE_ENV                    0x2300
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-#define GL_GENERATE_MIPMAP                0x8191
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-
-/* TextureUnit */
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-
-/* VertexPointerType */
-/*      GL_SHORT */
-/*      GL_FLOAT */
-/*      GL_FIXED */
-/*      GL_BYTE */
-
-/* LightName */
-#define GL_LIGHT0                         0x4000
-#define GL_LIGHT1                         0x4001
-#define GL_LIGHT2                         0x4002
-#define GL_LIGHT3                         0x4003
-#define GL_LIGHT4                         0x4004
-#define GL_LIGHT5                         0x4005
-#define GL_LIGHT6                         0x4006
-#define GL_LIGHT7                         0x4007
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-
-#define GL_ARRAY_BUFFER_BINDING               0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING       0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING        0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING        0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING         0x8898
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-
-/* Texture combine + dot3 */
-#define GL_SUBTRACT                       0x84E7
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-
-#define GL_ALPHA_SCALE                    0x0D1C
-
-#define GL_SRC0_RGB                       0x8580
-#define GL_SRC1_RGB                       0x8581
-#define GL_SRC2_RGB                       0x8582
-#define GL_SRC0_ALPHA                     0x8588
-#define GL_SRC1_ALPHA                     0x8589
-#define GL_SRC2_ALPHA                     0x858A
-
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-
-/*------------------------------------------------------------------------*
- * required OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES                   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES                 0x8B9B
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-/* OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
-#define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
-#define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
-#define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
-#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
-#endif
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_POINT_SPRITE_OES                                     0x8861
-#define GL_COORD_REPLACE_OES                                    0x8862
-#endif
-
-/*************************************************************/
-
-/* Available only in Common profile */
-GL_API void GL_APIENTRY glAlphaFunc (GLenum func, GLclampf ref);
-GL_API void GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_API void GL_APIENTRY glClearDepthf (GLclampf depth);
-GL_API void GL_APIENTRY glClipPlanef (GLenum plane, const GLfloat *equation);
-GL_API void GL_APIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GL_API void GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
-GL_API void GL_APIENTRY glFogf (GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glFogfv (GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, GLfloat eqn[4]);
-GL_API void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetTexEnvfv (GLenum env, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glLightModelf (GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glLineWidth (GLfloat width);
-GL_API void GL_APIENTRY glLoadMatrixf (const GLfloat *m);
-GL_API void GL_APIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glMultMatrixf (const GLfloat *m);
-GL_API void GL_APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-GL_API void GL_APIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
-GL_API void GL_APIENTRY glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-GL_API void GL_APIENTRY glPointParameterf (GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glPointSize (GLfloat size);
-GL_API void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_API void GL_APIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-GL_API void GL_APIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
-GL_API void GL_APIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
-
-/* Available in both Common and Common-Lite profiles */
-GL_API void GL_APIENTRY glActiveTexture (GLenum texture);
-GL_API void GL_APIENTRY glAlphaFuncx (GLenum func, GLclampx ref);
-GL_API void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_API void GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_API void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_API void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-GL_API void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-GL_API void GL_APIENTRY glClear (GLbitfield mask);
-GL_API void GL_APIENTRY glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-GL_API void GL_APIENTRY glClearDepthx (GLclampx depth);
-GL_API void GL_APIENTRY glClearStencil (GLint s);
-GL_API void GL_APIENTRY glClientActiveTexture (GLenum texture);
-GL_API void GL_APIENTRY glClipPlanex (GLenum plane, const GLfixed *equation);
-GL_API void GL_APIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-GL_API void GL_APIENTRY glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-GL_API void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_API void GL_APIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GL_API void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-GL_API void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-GL_API void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_API void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_API void GL_APIENTRY glCullFace (GLenum mode);
-GL_API void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
-GL_API void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
-GL_API void GL_APIENTRY glDepthFunc (GLenum func);
-GL_API void GL_APIENTRY glDepthMask (GLboolean flag);
-GL_API void GL_APIENTRY glDepthRangex (GLclampx zNear, GLclampx zFar);
-GL_API void GL_APIENTRY glDisable (GLenum cap);
-GL_API void GL_APIENTRY glDisableClientState (GLenum array);
-GL_API void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_API void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-GL_API void GL_APIENTRY glEnable (GLenum cap);
-GL_API void GL_APIENTRY glEnableClientState (GLenum array);
-GL_API void GL_APIENTRY glFinish (void);
-GL_API void GL_APIENTRY glFlush (void);
-GL_API void GL_APIENTRY glFogx (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glFogxv (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glFrontFace (GLenum mode);
-GL_API void GL_APIENTRY glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-GL_API void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
-GL_API void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetClipPlanex (GLenum pname, GLfixed eqn[4]);
-GL_API void GL_APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
-GL_API void GL_APIENTRY glGenTextures (GLsizei n, GLuint *textures);
-GL_API GLenum GL_APIENTRY glGetError (void);
-GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
-GL_API const GLubyte * GL_APIENTRY glGetString (GLenum name);
-GL_API void GL_APIENTRY glGetTexEnviv (GLenum env, GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetTexEnvxv (GLenum env, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetTexParameterxv (GLenum target, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_API GLboolean GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_API GLboolean GL_APIENTRY glIsEnabled (GLenum cap);
-GL_API GLboolean GL_APIENTRY glIsTexture (GLuint texture);
-GL_API void GL_APIENTRY glLightModelx (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glLightModelxv (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glLightx (GLenum light, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glLightxv (GLenum light, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glLineWidthx (GLfixed width);
-GL_API void GL_APIENTRY glLoadIdentity (void);
-GL_API void GL_APIENTRY glLoadMatrixx (const GLfixed *m);
-GL_API void GL_APIENTRY glLogicOp (GLenum opcode);
-GL_API void GL_APIENTRY glMaterialx (GLenum face, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glMaterialxv (GLenum face, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glMatrixMode (GLenum mode);
-GL_API void GL_APIENTRY glMultMatrixx (const GLfixed *m);
-GL_API void GL_APIENTRY glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-GL_API void GL_APIENTRY glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz);
-GL_API void GL_APIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
-GL_API void GL_APIENTRY glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-GL_API void GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_API void GL_APIENTRY glPointParameterx (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glPointParameterxv (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glPointSizex (GLfixed size);
-GL_API void GL_APIENTRY glPolygonOffsetx (GLfixed factor, GLfixed units);
-GL_API void GL_APIENTRY glPopMatrix (void);
-GL_API void GL_APIENTRY glPushMatrix (void);
-GL_API void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-GL_API void GL_APIENTRY glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-GL_API void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GL_API void GL_APIENTRY glSampleCoveragex (GLclampx value, GLboolean invert);
-GL_API void GL_APIENTRY glScalex (GLfixed x, GLfixed y, GLfixed z);
-GL_API void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_API void GL_APIENTRY glShadeModel (GLenum mode);
-GL_API void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GL_API void GL_APIENTRY glStencilMask (GLuint mask);
-GL_API void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GL_API void GL_APIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GL_API void GL_APIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
-GL_API void GL_APIENTRY glTexEnvx (GLenum target, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
-GL_API void GL_APIENTRY glTexEnvxv (GLenum target, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-GL_API void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GL_API void GL_APIENTRY glTexParameterx (GLenum target, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
-GL_API void GL_APIENTRY glTexParameterxv (GLenum target, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-GL_API void GL_APIENTRY glTranslatex (GLfixed x, GLfixed y, GLfixed z);
-GL_API void GL_APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GL_API void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
-/*------------------------------------------------------------------------*
- * Required OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_read_format */
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-#endif
-
-/* GL_OES_point_size_array */
-#ifndef GL_OES_point_size_array
-#define GL_OES_point_size_array 1
-GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-/* GL_OES_point_sprite */
-#ifndef GL_OES_point_sprite
-#define GL_OES_point_sprite 1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl_h_ */
-
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES/glext.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES/glext.h
deleted file mode 100644
index a8fe2e9..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES/glext.h
+++ /dev/null
@@ -1,607 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-/* $Revision: 7172 $ on $Date:: 2009-01-09 11:17:41 -0800 #$ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-#ifndef GL_APIENTRYP
-#   define GL_APIENTRYP GL_APIENTRY*
-#endif
-
-/*------------------------------------------------------------------------*
- * OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_OES_blend_equation_separate */
-#ifndef GL_OES_blend_equation_separate
-/* BLEND_EQUATION_RGB_OES same as BLEND_EQUATION_OES */
-#define GL_BLEND_EQUATION_RGB_OES                               0x8009
-#define GL_BLEND_EQUATION_ALPHA_OES                             0x883D
-#endif
-
-/* GL_OES_blend_func_separate */
-#ifndef GL_OES_blend_func_separate
-#define GL_BLEND_DST_RGB_OES                                    0x80C8
-#define GL_BLEND_SRC_RGB_OES                                    0x80C9
-#define GL_BLEND_DST_ALPHA_OES                                  0x80CA
-#define GL_BLEND_SRC_ALPHA_OES                                  0x80CB
-#endif
-
-/* GL_OES_blend_subtract */
-#ifndef GL_OES_blend_subtract
-#define GL_BLEND_EQUATION_OES                                   0x8009
-#define GL_FUNC_ADD_OES                                         0x8006
-#define GL_FUNC_SUBTRACT_OES                                    0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_OES                            0x800B
-#endif
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_ETC1_RGB8_OES                                        0x8D64
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_DEPTH_COMPONENT24_OES                                0x81A6
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_DEPTH_COMPONENT32_OES                                0x81A7
-#endif
-
-/* GL_OES_draw_texture */
-#ifndef GL_OES_draw_texture
-#define GL_TEXTURE_CROP_RECT_OES                                0x8B9D
-#endif
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-typedef void* GLeglImageOES;
-#endif
-
-/* GL_OES_fixed_point */
-#ifndef GL_OES_fixed_point
-#define GL_FIXED_OES                                            0x140C
-#endif
-
-/* GL_OES_framebuffer_object */
-#ifndef GL_OES_framebuffer_object
-#define GL_NONE_OES                                             0
-#define GL_FRAMEBUFFER_OES                                      0x8D40
-#define GL_RENDERBUFFER_OES                                     0x8D41
-#define GL_RGBA4_OES                                            0x8056
-#define GL_RGB5_A1_OES                                          0x8057
-#define GL_RGB565_OES                                           0x8D62
-#define GL_DEPTH_COMPONENT16_OES                                0x81A5
-#define GL_RENDERBUFFER_WIDTH_OES                               0x8D42
-#define GL_RENDERBUFFER_HEIGHT_OES                              0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_OES                     0x8D44
-#define GL_RENDERBUFFER_RED_SIZE_OES                            0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_OES                          0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_OES                           0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_OES                          0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_OES                          0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_OES                        0x8D55
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES               0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES               0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES             0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES     0x8CD3
-#define GL_COLOR_ATTACHMENT0_OES                                0x8CE0
-#define GL_DEPTH_ATTACHMENT_OES                                 0x8D00
-#define GL_STENCIL_ATTACHMENT_OES                               0x8D20
-#define GL_FRAMEBUFFER_COMPLETE_OES                             0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES                0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES        0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES                0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES                   0x8CDA
-#define GL_FRAMEBUFFER_UNSUPPORTED_OES                          0x8CDD
-#define GL_FRAMEBUFFER_BINDING_OES                              0x8CA6
-#define GL_RENDERBUFFER_BINDING_OES                             0x8CA7
-#define GL_MAX_RENDERBUFFER_SIZE_OES                            0x84E8
-#define GL_INVALID_FRAMEBUFFER_OPERATION_OES                    0x0506
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_WRITE_ONLY_OES                                       0x88B9
-#define GL_BUFFER_ACCESS_OES                                    0x88BB
-#define GL_BUFFER_MAPPED_OES                                    0x88BC
-#define GL_BUFFER_MAP_POINTER_OES                               0x88BD
-#endif
-
-/* GL_OES_matrix_get */
-#ifndef GL_OES_matrix_get
-#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES               0x898D
-#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES              0x898E
-#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES                 0x898F
-#endif
-
-/* GL_OES_matrix_palette */
-#ifndef GL_OES_matrix_palette
-#define GL_MAX_VERTEX_UNITS_OES                                 0x86A4
-#define GL_MAX_PALETTE_MATRICES_OES                             0x8842
-#define GL_MATRIX_PALETTE_OES                                   0x8840
-#define GL_MATRIX_INDEX_ARRAY_OES                               0x8844
-#define GL_WEIGHT_ARRAY_OES                                     0x86AD
-#define GL_CURRENT_PALETTE_MATRIX_OES                           0x8843
-#define GL_MATRIX_INDEX_ARRAY_SIZE_OES                          0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_OES                          0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_OES                        0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_OES                       0x8849
-#define GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES                0x8B9E
-#define GL_WEIGHT_ARRAY_SIZE_OES                                0x86AB
-#define GL_WEIGHT_ARRAY_TYPE_OES                                0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_OES                              0x86AA
-#define GL_WEIGHT_ARRAY_POINTER_OES                             0x86AC
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_OES                      0x889E
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_DEPTH_STENCIL_OES                                    0x84F9
-#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
-#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
-#endif
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_RGB8_OES                                             0x8051
-#define GL_RGBA8_OES                                            0x8058
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_STENCIL_INDEX1_OES                                   0x8D46
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_STENCIL_INDEX4_OES                                   0x8D47
-#endif
-
-/* GL_OES_stencil8 */
-#ifndef GL_OES_stencil8
-#define GL_STENCIL_INDEX8_OES                                   0x8D48
-#endif
-
-/* GL_OES_stencil_wrap */
-#ifndef GL_OES_stencil_wrap
-#define GL_INCR_WRAP_OES                                        0x8507
-#define GL_DECR_WRAP_OES                                        0x8508
-#endif
-
-/* GL_OES_texture_cube_map */
-#ifndef GL_OES_texture_cube_map
-#define GL_NORMAL_MAP_OES                                       0x8511
-#define GL_REFLECTION_MAP_OES                                   0x8512
-#define GL_TEXTURE_CUBE_MAP_OES                                 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_OES                         0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES                      0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES                      0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES                      0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES                      0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES                      0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES                      0x851A
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES                        0x851C
-#define GL_TEXTURE_GEN_MODE_OES                                 0x2500
-#define GL_TEXTURE_GEN_STR_OES                                  0x8D60
-#endif
-
-/* GL_OES_texture_mirrored_repeat */
-#ifndef GL_OES_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_OES                                  0x8370
-#endif
-
-/*------------------------------------------------------------------------*
- * AMD extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_3DC_X_AMD                                            0x87F9
-#define GL_3DC_XY_AMD                                           0x87FA
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_ATC_RGB_AMD                                          0x8C92
-#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD                          0x8C93
-#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD                      0x87EE
-#endif
-
-/*------------------------------------------------------------------------*
- * EXT extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
-#endif
-
-/*------------------------------------------------------------------------*
- * OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_blend_equation_separate */
-#ifndef GL_OES_blend_equation_separate
-#define GL_OES_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glBlendEquationSeparateOES (GLenum modeRGB, GLenum modeAlpha);
-#endif
-typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEOESPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-/* GL_OES_blend_func_separate */
-#ifndef GL_OES_blend_func_separate
-#define GL_OES_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glBlendFuncSeparateOES (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEOESPROC) (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-#endif
-
-/* GL_OES_blend_subtract */
-#ifndef GL_OES_blend_subtract
-#define GL_OES_blend_subtract 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glBlendEquationOES (GLenum mode);
-#endif
-typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONOESPROC) (GLenum mode);
-#endif
-
-/* GL_OES_byte_coordinates */
-#ifndef GL_OES_byte_coordinates
-#define GL_OES_byte_coordinates 1
-#endif
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_OES_compressed_ETC1_RGB8_texture 1
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_OES_depth24 1
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_OES_depth32 1
-#endif
-
-/* GL_OES_draw_texture */
-#ifndef GL_OES_draw_texture
-#define GL_OES_draw_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-GL_API void GL_APIENTRY glDrawTexiOES (GLint x, GLint y, GLint z, GLint width, GLint height);
-GL_API void GL_APIENTRY glDrawTexxOES (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-GL_API void GL_APIENTRY glDrawTexsvOES (const GLshort *coords);
-GL_API void GL_APIENTRY glDrawTexivOES (const GLint *coords);
-GL_API void GL_APIENTRY glDrawTexxvOES (const GLfixed *coords);
-GL_API void GL_APIENTRY glDrawTexfOES (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-GL_API void GL_APIENTRY glDrawTexfvOES (const GLfloat *coords);
-#endif
-typedef void (GL_APIENTRYP PFNGLDRAWTEXSOESPROC) (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXIOESPROC) (GLint x, GLint y, GLint z, GLint width, GLint height);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXXOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXSVOESPROC) (const GLshort *coords);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXIVOESPROC) (const GLint *coords);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXXVOESPROC) (const GLfixed *coords);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXFOESPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-typedef void (GL_APIENTRYP PFNGLDRAWTEXFVOESPROC) (const GLfloat *coords);
-#endif
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-#define GL_OES_EGL_image 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
-GL_API void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
-#endif
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
-#endif
-
-/* GL_OES_element_index_uint */
-#ifndef GL_OES_element_index_uint
-#define GL_OES_element_index_uint 1
-#endif
-
-/* GL_OES_extended_matrix_palette */
-#ifndef GL_OES_extended_matrix_palette
-#define GL_OES_extended_matrix_palette 1
-#endif
-
-/* GL_OES_fbo_render_mipmap */
-#ifndef GL_OES_fbo_render_mipmap
-#define GL_OES_fbo_render_mipmap 1
-#endif
-
-/* GL_OES_fixed_point */
-#ifndef GL_OES_fixed_point
-#define GL_OES_fixed_point 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glAlphaFuncxOES (GLenum func, GLclampx ref);
-GL_API void GL_APIENTRY glClearColorxOES (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-GL_API void GL_APIENTRY glClearDepthxOES (GLclampx depth);
-GL_API void GL_APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
-GL_API void GL_APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-GL_API void GL_APIENTRY glDepthRangexOES (GLclampx zNear, GLclampx zFar);
-GL_API void GL_APIENTRY glFogxOES (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glFogxvOES (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glFrustumxOES (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-GL_API void GL_APIENTRY glGetClipPlanexOES (GLenum pname, GLfixed eqn[4]);
-GL_API void GL_APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetLightxvOES (GLenum light, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetMaterialxvOES (GLenum face, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetTexEnvxvOES (GLenum env, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
-GL_API void GL_APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glLineWidthxOES (GLfixed width);
-GL_API void GL_APIENTRY glLoadMatrixxOES (const GLfixed *m);
-GL_API void GL_APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glMultMatrixxOES (const GLfixed *m);
-GL_API void GL_APIENTRY glMultiTexCoord4xOES (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-GL_API void GL_APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
-GL_API void GL_APIENTRY glOrthoxOES (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-GL_API void GL_APIENTRY glPointParameterxOES (GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glPointSizexOES (GLfixed size);
-GL_API void GL_APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
-GL_API void GL_APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-GL_API void GL_APIENTRY glSampleCoveragexOES (GLclampx value, GLboolean invert);
-GL_API void GL_APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
-GL_API void GL_APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
-#endif
-typedef void (GL_APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLclampx ref);
-typedef void (GL_APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-typedef void (GL_APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLclampx depth);
-typedef void (GL_APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
-typedef void (GL_APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-typedef void (GL_APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLclampx zNear, GLclampx zFar);
-typedef void (GL_APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum pname, GLfixed eqn[4]);
-typedef void (GL_APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLGETLIGHTXVOESPROC) (GLenum light, GLenum pname, GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLGETMATERIALXVOESPROC) (GLenum face, GLenum pname, GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum env, GLenum pname, GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
-typedef void (GL_APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
-typedef void (GL_APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
-typedef void (GL_APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-typedef void (GL_APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
-typedef void (GL_APIENTRYP PFNGLORTHOXOESPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXOESPROC) (GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
-typedef void (GL_APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
-typedef void (GL_APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-typedef void (GL_APIENTRYP PFNGLSAMPLECOVERAGEXOESPROC) (GLclampx value, GLboolean invert);
-typedef void (GL_APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-typedef void (GL_APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-#endif
-
-/* GL_OES_framebuffer_object */
-#ifndef GL_OES_framebuffer_object
-#define GL_OES_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API GLboolean GL_APIENTRY glIsRenderbufferOES (GLuint renderbuffer);
-GL_API void GL_APIENTRY glBindRenderbufferOES (GLenum target, GLuint renderbuffer);
-GL_API void GL_APIENTRY glDeleteRenderbuffersOES (GLsizei n, const GLuint* renderbuffers);
-GL_API void GL_APIENTRY glGenRenderbuffersOES (GLsizei n, GLuint* renderbuffers);
-GL_API void GL_APIENTRY glRenderbufferStorageOES (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GL_API void GL_APIENTRY glGetRenderbufferParameterivOES (GLenum target, GLenum pname, GLint* params);
-GL_API GLboolean GL_APIENTRY glIsFramebufferOES (GLuint framebuffer);
-GL_API void GL_APIENTRY glBindFramebufferOES (GLenum target, GLuint framebuffer);
-GL_API void GL_APIENTRY glDeleteFramebuffersOES (GLsizei n, const GLuint* framebuffers);
-GL_API void GL_APIENTRY glGenFramebuffersOES (GLsizei n, GLuint* framebuffers);
-GL_API GLenum GL_APIENTRY glCheckFramebufferStatusOES (GLenum target);
-GL_API void GL_APIENTRY glFramebufferRenderbufferOES (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_API void GL_APIENTRY glFramebufferTexture2DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_API void GL_APIENTRY glGetFramebufferAttachmentParameterivOES (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-GL_API void GL_APIENTRY glGenerateMipmapOES (GLenum target);
-#endif
-typedef GLboolean (GL_APIENTRYP PFNGLISRENDERBUFFEROESPROC) (GLuint renderbuffer);
-typedef void (GL_APIENTRYP PFNGLBINDRENDERBUFFEROESPROC) (GLenum target, GLuint renderbuffer);
-typedef void (GL_APIENTRYP PFNGLDELETERENDERBUFFERSOESPROC) (GLsizei n, const GLuint* renderbuffers);
-typedef void (GL_APIENTRYP PFNGLGENRENDERBUFFERSOESPROC) (GLsizei n, GLuint* renderbuffers);
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVOESPROC) (GLenum target, GLenum pname, GLint* params);
-typedef GLboolean (GL_APIENTRYP PFNGLISFRAMEBUFFEROESPROC) (GLuint framebuffer);
-typedef void (GL_APIENTRYP PFNGLBINDFRAMEBUFFEROESPROC) (GLenum target, GLuint framebuffer);
-typedef void (GL_APIENTRYP PFNGLDELETEFRAMEBUFFERSOESPROC) (GLsizei n, const GLuint* framebuffers);
-typedef void (GL_APIENTRYP PFNGLGENFRAMEBUFFERSOESPROC) (GLsizei n, GLuint* framebuffers);
-typedef GLenum (GL_APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSOESPROC) (GLenum target);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEROESPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (GL_APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVOESPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-typedef void (GL_APIENTRYP PFNGLGENERATEMIPMAPOESPROC) (GLenum target);
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_OES_mapbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
-GL_API GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
-GL_API void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, void** params);
-#endif
-typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
-typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
-typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void** params);
-#endif
-
-/* GL_OES_matrix_get */
-#ifndef GL_OES_matrix_get
-#define GL_OES_matrix_get 1
-#endif
-
-/* GL_OES_matrix_palette */
-#ifndef GL_OES_matrix_palette
-#define GL_OES_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glCurrentPaletteMatrixOES (GLuint matrixpaletteindex);
-GL_API void GL_APIENTRY glLoadPaletteFromModelViewMatrixOES (void);
-GL_API void GL_APIENTRY glMatrixIndexPointerOES (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-GL_API void GL_APIENTRY glWeightPointerOES (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-typedef void (GL_APIENTRYP PFNGLCURRENTPALETTEMATRIXOESPROC) (GLuint matrixpaletteindex);
-typedef void (GL_APIENTRYP PFNGLLOADPALETTEFROMMODELVIEWMATRIXOESPROC) (void);
-typedef void (GL_APIENTRYP PFNGLMATRIXINDEXPOINTEROESPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (GL_APIENTRYP PFNGLWEIGHTPOINTEROESPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_OES_packed_depth_stencil 1
-#endif
-
-/* GL_OES_query_matrix */
-#ifndef GL_OES_query_matrix
-#define GL_OES_query_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES (GLfixed mantissa[16], GLint exponent[16]);
-#endif
-typedef GLbitfield (GL_APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed mantissa[16], GLint exponent[16]);
-#endif
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_OES_rgb8_rgba8 1
-#endif
-
-/* GL_OES_single_precision */
-#ifndef GL_OES_single_precision
-#define GL_OES_single_precision 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glDepthRangefOES (GLclampf zNear, GLclampf zFar);
-GL_API void GL_APIENTRY glFrustumfOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-GL_API void GL_APIENTRY glOrthofOES (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-GL_API void GL_APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
-GL_API void GL_APIENTRY glGetClipPlanefOES (GLenum pname, GLfloat eqn[4]);
-GL_API void GL_APIENTRY glClearDepthfOES (GLclampf depth);
-#endif
-typedef void (GL_APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf zNear, GLclampf zFar);
-typedef void (GL_APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-typedef void (GL_APIENTRYP PFNGLORTHOFOESPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-typedef void (GL_APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
-typedef void (GL_APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum pname, GLfloat eqn[4]);
-typedef void (GL_APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_OES_stencil1 1
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_OES_stencil4 1
-#endif
-
-/* GL_OES_stencil8 */
-#ifndef GL_OES_stencil8
-#define GL_OES_stencil8 1
-#endif
-
-/* GL_OES_stencil_wrap */
-#ifndef GL_OES_stencil_wrap
-#define GL_OES_stencil_wrap 1
-#endif
-
-/* GL_OES_texture_cube_map */
-#ifndef GL_OES_texture_cube_map
-#define GL_OES_texture_cube_map 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_API void GL_APIENTRY glTexGenfOES (GLenum coord, GLenum pname, GLfloat param);
-GL_API void GL_APIENTRY glTexGenfvOES (GLenum coord, GLenum pname, const GLfloat *params);
-GL_API void GL_APIENTRY glTexGeniOES (GLenum coord, GLenum pname, GLint param);
-GL_API void GL_APIENTRY glTexGenivOES (GLenum coord, GLenum pname, const GLint *params);
-GL_API void GL_APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
-GL_API void GL_APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
-GL_API void GL_APIENTRY glGetTexGenfvOES (GLenum coord, GLenum pname, GLfloat *params);
-GL_API void GL_APIENTRY glGetTexGenivOES (GLenum coord, GLenum pname, GLint *params);
-GL_API void GL_APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
-#endif
-typedef void (GL_APIENTRYP PFNGLTEXGENFOESPROC) (GLenum coord, GLenum pname, GLfloat param);
-typedef void (GL_APIENTRYP PFNGLTEXGENFVOESPROC) (GLenum coord, GLenum pname, const GLfloat *params);
-typedef void (GL_APIENTRYP PFNGLTEXGENIOESPROC) (GLenum coord, GLenum pname, GLint param);
-typedef void (GL_APIENTRYP PFNGLTEXGENIVOESPROC) (GLenum coord, GLenum pname, const GLint *params);
-typedef void (GL_APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
-typedef void (GL_APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
-typedef void (GL_APIENTRYP PFNGLGETTEXGENFVOESPROC) (GLenum coord, GLenum pname, GLfloat *params);
-typedef void (GL_APIENTRYP PFNGLGETTEXGENIVOESPROC) (GLenum coord, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
-#endif
-
-/* GL_OES_texture_env_crossbar */
-#ifndef GL_OES_texture_env_crossbar
-#define GL_OES_texture_env_crossbar 1
-#endif
-
-/* GL_OES_texture_mirrored_repeat */
-#ifndef GL_OES_texture_mirrored_repeat
-#define GL_OES_texture_mirrored_repeat 1
-#endif
-
-/*------------------------------------------------------------------------*
- * AMD extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_AMD_compressed_3DC_texture 1
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_AMD_compressed_ATC_texture 1
-#endif
-
-/*------------------------------------------------------------------------*
- * EXT extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glext_h_ */
-
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES/glplatform.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES/glplatform.h
deleted file mode 100644
index 0924cae..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES/glplatform.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __glplatform_h_
-#define __glplatform_h_
-
-/* $Revision: 7172 $ on $Date:: 2009-01-09 11:17:41 -0800 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 1.X  gl.h
- * Last modified on 2008/12/19
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_API
-#define GL_API      KHRONOS_APICALL
-#endif
-
-#if defined(ANDROID)
-
-#define GL_APIENTRY KHRONOS_APIENTRY
-
-// XXX: this should probably not be here
-#define GL_DIRECT_TEXTURE_2D_QUALCOMM               0x7E80
-
-// XXX: not sure how this is intended to be used
-#define GL_GLEXT_PROTOTYPES
-
-#endif
-
-#endif /* __glplatform_h_ */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2.h
deleted file mode 100644
index 0182a67..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2.h
+++ /dev/null
@@ -1,620 +0,0 @@
-#ifndef __gl2_h_
-#define __gl2_h_
-
-/* $Revision: 7173 $ on $Date:: 2009-01-09 11:18:21 -0800 #$ */
-
-#include <GLES2/gl2platform.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/*-------------------------------------------------------------------------
- * Data type definitions
- *-----------------------------------------------------------------------*/
-
-typedef void             GLvoid;
-typedef unsigned int     GLenum;
-typedef unsigned char    GLboolean;
-typedef unsigned int     GLbitfield;
-typedef khronos_int8_t   GLbyte;
-typedef short            GLshort;
-typedef int              GLint;
-typedef int              GLsizei;
-typedef khronos_uint8_t  GLubyte;
-typedef unsigned short   GLushort;
-typedef unsigned int     GLuint;
-typedef khronos_float_t  GLfloat;
-typedef khronos_float_t  GLclampf;
-typedef khronos_int32_t  GLfixed;
-
-/* GL types for handling large vertex buffer objects */
-typedef khronos_intptr_t GLintptr;
-typedef khronos_ssize_t  GLsizeiptr;
-
-/* OpenGL ES core versions */
-#define GL_ES_VERSION_2_0                 1
-
-/* ClearBufferMask */
-#define GL_DEPTH_BUFFER_BIT               0x00000100
-#define GL_STENCIL_BUFFER_BIT             0x00000400
-#define GL_COLOR_BUFFER_BIT               0x00004000
-
-/* Boolean */
-#define GL_FALSE                          0
-#define GL_TRUE                           1
-
-/* BeginMode */
-#define GL_POINTS                         0x0000
-#define GL_LINES                          0x0001
-#define GL_LINE_LOOP                      0x0002
-#define GL_LINE_STRIP                     0x0003
-#define GL_TRIANGLES                      0x0004
-#define GL_TRIANGLE_STRIP                 0x0005
-#define GL_TRIANGLE_FAN                   0x0006
-
-/* AlphaFunction (not supported in ES20) */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* BlendingFactorDest */
-#define GL_ZERO                           0
-#define GL_ONE                            1
-#define GL_SRC_COLOR                      0x0300
-#define GL_ONE_MINUS_SRC_COLOR            0x0301
-#define GL_SRC_ALPHA                      0x0302
-#define GL_ONE_MINUS_SRC_ALPHA            0x0303
-#define GL_DST_ALPHA                      0x0304
-#define GL_ONE_MINUS_DST_ALPHA            0x0305
-
-/* BlendingFactorSrc */
-/*      GL_ZERO */
-/*      GL_ONE */
-#define GL_DST_COLOR                      0x0306
-#define GL_ONE_MINUS_DST_COLOR            0x0307
-#define GL_SRC_ALPHA_SATURATE             0x0308
-/*      GL_SRC_ALPHA */
-/*      GL_ONE_MINUS_SRC_ALPHA */
-/*      GL_DST_ALPHA */
-/*      GL_ONE_MINUS_DST_ALPHA */
-
-/* BlendEquationSeparate */
-#define GL_FUNC_ADD                       0x8006
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_BLEND_EQUATION_RGB             0x8009    /* same as BLEND_EQUATION */
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-
-/* BlendSubtract */
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-
-/* Separate Blend Functions */
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-
-/* Buffer Objects */
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_DYNAMIC_DRAW                   0x88E8
-
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-
-/* CullFaceMode */
-#define GL_FRONT                          0x0404
-#define GL_BACK                           0x0405
-#define GL_FRONT_AND_BACK                 0x0408
-
-/* DepthFunction */
-/*      GL_NEVER */
-/*      GL_LESS */
-/*      GL_EQUAL */
-/*      GL_LEQUAL */
-/*      GL_GREATER */
-/*      GL_NOTEQUAL */
-/*      GL_GEQUAL */
-/*      GL_ALWAYS */
-
-/* EnableCap */
-#define GL_TEXTURE_2D                     0x0DE1
-#define GL_CULL_FACE                      0x0B44
-#define GL_BLEND                          0x0BE2
-#define GL_DITHER                         0x0BD0
-#define GL_STENCIL_TEST                   0x0B90
-#define GL_DEPTH_TEST                     0x0B71
-#define GL_SCISSOR_TEST                   0x0C11
-#define GL_POLYGON_OFFSET_FILL            0x8037
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_COVERAGE                0x80A0
-
-/* ErrorCode */
-#define GL_NO_ERROR                       0
-#define GL_INVALID_ENUM                   0x0500
-#define GL_INVALID_VALUE                  0x0501
-#define GL_INVALID_OPERATION              0x0502
-#define GL_OUT_OF_MEMORY                  0x0505
-
-/* FrontFaceDirection */
-#define GL_CW                             0x0900
-#define GL_CCW                            0x0901
-
-/* GetPName */
-#define GL_LINE_WIDTH                     0x0B21
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#define GL_CULL_FACE_MODE                 0x0B45
-#define GL_FRONT_FACE                     0x0B46
-#define GL_DEPTH_RANGE                    0x0B70
-#define GL_DEPTH_WRITEMASK                0x0B72
-#define GL_DEPTH_CLEAR_VALUE              0x0B73
-#define GL_DEPTH_FUNC                     0x0B74
-#define GL_STENCIL_CLEAR_VALUE            0x0B91
-#define GL_STENCIL_FUNC                   0x0B92
-#define GL_STENCIL_FAIL                   0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
-#define GL_STENCIL_REF                    0x0B97
-#define GL_STENCIL_VALUE_MASK             0x0B93
-#define GL_STENCIL_WRITEMASK              0x0B98
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#define GL_VIEWPORT                       0x0BA2
-#define GL_SCISSOR_BOX                    0x0C10
-/*      GL_SCISSOR_TEST */
-#define GL_COLOR_CLEAR_VALUE              0x0C22
-#define GL_COLOR_WRITEMASK                0x0C23
-#define GL_UNPACK_ALIGNMENT               0x0CF5
-#define GL_PACK_ALIGNMENT                 0x0D05
-#define GL_MAX_TEXTURE_SIZE               0x0D33
-#define GL_MAX_VIEWPORT_DIMS              0x0D3A
-#define GL_SUBPIXEL_BITS                  0x0D50
-#define GL_RED_BITS                       0x0D52
-#define GL_GREEN_BITS                     0x0D53
-#define GL_BLUE_BITS                      0x0D54
-#define GL_ALPHA_BITS                     0x0D55
-#define GL_DEPTH_BITS                     0x0D56
-#define GL_STENCIL_BITS                   0x0D57
-#define GL_POLYGON_OFFSET_UNITS           0x2A00
-/*      GL_POLYGON_OFFSET_FILL */
-#define GL_POLYGON_OFFSET_FACTOR          0x8038
-#define GL_TEXTURE_BINDING_2D             0x8069
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-
-/* GetTextureParameter */
-/*      GL_TEXTURE_MAG_FILTER */
-/*      GL_TEXTURE_MIN_FILTER */
-/*      GL_TEXTURE_WRAP_S */
-/*      GL_TEXTURE_WRAP_T */
-
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-
-/* HintMode */
-#define GL_DONT_CARE                      0x1100
-#define GL_FASTEST                        0x1101
-#define GL_NICEST                         0x1102
-
-/* HintTarget */
-#define GL_GENERATE_MIPMAP_HINT            0x8192
-
-/* DataType */
-#define GL_BYTE                           0x1400
-#define GL_UNSIGNED_BYTE                  0x1401
-#define GL_SHORT                          0x1402
-#define GL_UNSIGNED_SHORT                 0x1403
-#define GL_INT                            0x1404
-#define GL_UNSIGNED_INT                   0x1405
-#define GL_FLOAT                          0x1406
-#define GL_FIXED                          0x140C
-
-/* PixelFormat */
-#define GL_DEPTH_COMPONENT                0x1902
-#define GL_ALPHA                          0x1906
-#define GL_RGB                            0x1907
-#define GL_RGBA                           0x1908
-#define GL_LUMINANCE                      0x1909
-#define GL_LUMINANCE_ALPHA                0x190A
-
-/* PixelType */
-/*      GL_UNSIGNED_BYTE */
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-
-/* Shaders */
-#define GL_FRAGMENT_SHADER                  0x8B30
-#define GL_VERTEX_SHADER                    0x8B31
-#define GL_MAX_VERTEX_ATTRIBS               0x8869
-#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
-#define GL_MAX_VARYING_VECTORS              0x8DFC
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS   0x8B4C
-#define GL_MAX_TEXTURE_IMAGE_UNITS          0x8872
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
-#define GL_SHADER_TYPE                      0x8B4F
-#define GL_DELETE_STATUS                    0x8B80
-#define GL_LINK_STATUS                      0x8B82
-#define GL_VALIDATE_STATUS                  0x8B83
-#define GL_ATTACHED_SHADERS                 0x8B85
-#define GL_ACTIVE_UNIFORMS                  0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH        0x8B87
-#define GL_ACTIVE_ATTRIBUTES                0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH      0x8B8A
-#define GL_SHADING_LANGUAGE_VERSION         0x8B8C
-#define GL_CURRENT_PROGRAM                  0x8B8D
-
-/* StencilFunction */
-#define GL_NEVER                          0x0200
-#define GL_LESS                           0x0201
-#define GL_EQUAL                          0x0202
-#define GL_LEQUAL                         0x0203
-#define GL_GREATER                        0x0204
-#define GL_NOTEQUAL                       0x0205
-#define GL_GEQUAL                         0x0206
-#define GL_ALWAYS                         0x0207
-
-/* StencilOp */
-/*      GL_ZERO */
-#define GL_KEEP                           0x1E00
-#define GL_REPLACE                        0x1E01
-#define GL_INCR                           0x1E02
-#define GL_DECR                           0x1E03
-#define GL_INVERT                         0x150A
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-
-/* StringName */
-#define GL_VENDOR                         0x1F00
-#define GL_RENDERER                       0x1F01
-#define GL_VERSION                        0x1F02
-#define GL_EXTENSIONS                     0x1F03
-
-/* TextureMagFilter */
-#define GL_NEAREST                        0x2600
-#define GL_LINEAR                         0x2601
-
-/* TextureMinFilter */
-/*      GL_NEAREST */
-/*      GL_LINEAR */
-#define GL_NEAREST_MIPMAP_NEAREST         0x2700
-#define GL_LINEAR_MIPMAP_NEAREST          0x2701
-#define GL_NEAREST_MIPMAP_LINEAR          0x2702
-#define GL_LINEAR_MIPMAP_LINEAR           0x2703
-
-/* TextureParameterName */
-#define GL_TEXTURE_MAG_FILTER             0x2800
-#define GL_TEXTURE_MIN_FILTER             0x2801
-#define GL_TEXTURE_WRAP_S                 0x2802
-#define GL_TEXTURE_WRAP_T                 0x2803
-
-/* TextureTarget */
-/*      GL_TEXTURE_2D */
-#define GL_TEXTURE                        0x1702
-
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-
-/* TextureUnit */
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-
-/* TextureWrapMode */
-#define GL_REPEAT                         0x2901
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_MIRRORED_REPEAT                0x8370
-
-/* Uniform Types */
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_CUBE                   0x8B60
-
-/* Vertex Arrays */
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED        0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE           0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE         0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE           0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED     0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER        0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-
-/* Read Format */
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE   0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-
-/* Shader Source */
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_SHADER_COMPILER                0x8DFA
-
-/* Shader Binary */
-#define GL_SHADER_BINARY_FORMATS          0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-
-/* Shader Precision-Specified Types */
-#define GL_LOW_FLOAT                      0x8DF0
-#define GL_MEDIUM_FLOAT                   0x8DF1
-#define GL_HIGH_FLOAT                     0x8DF2
-#define GL_LOW_INT                        0x8DF3
-#define GL_MEDIUM_INT                     0x8DF4
-#define GL_HIGH_INT                       0x8DF5
-
-/* Framebuffer Object. */
-#define GL_FRAMEBUFFER                    0x8D40
-#define GL_RENDERBUFFER                   0x8D41
-
-#define GL_RGBA4                          0x8056
-#define GL_RGB5_A1                        0x8057
-#define GL_RGB565                         0x8D62
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_STENCIL_INDEX                  0x1901
-#define GL_STENCIL_INDEX8                 0x8D48
-
-#define GL_RENDERBUFFER_WIDTH             0x8D42
-#define GL_RENDERBUFFER_HEIGHT            0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
-#define GL_RENDERBUFFER_RED_SIZE          0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
-
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-
-#define GL_COLOR_ATTACHMENT0              0x8CE0
-#define GL_DEPTH_ATTACHMENT               0x8D00
-#define GL_STENCIL_ATTACHMENT             0x8D20
-
-#define GL_NONE                           0
-
-#define GL_FRAMEBUFFER_COMPLETE                      0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
-#define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
-
-#define GL_FRAMEBUFFER_BINDING            0x8CA6
-#define GL_RENDERBUFFER_BINDING           0x8CA7
-#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
-
-#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
-
-/*-------------------------------------------------------------------------
- * GL core functions.
- *-----------------------------------------------------------------------*/
-
-GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
-GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const char* name);
-GL_APICALL void         GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
-GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
-GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
-GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glBlendEquation ( GLenum mode );
-GL_APICALL void         GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
-GL_APICALL void         GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
-GL_APICALL void         GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GL_APICALL void         GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void* data, GLenum usage);
-GL_APICALL void         GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
-GL_APICALL GLenum       GL_APIENTRY glCheckFramebufferStatus (GLenum target);
-GL_APICALL void         GL_APIENTRY glClear (GLbitfield mask);
-GL_APICALL void         GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-GL_APICALL void         GL_APIENTRY glClearDepthf (GLclampf depth);
-GL_APICALL void         GL_APIENTRY glClearStencil (GLint s);
-GL_APICALL void         GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GL_APICALL void         GL_APIENTRY glCompileShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-GL_APICALL void         GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-GL_APICALL void         GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GL_APICALL void         GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL GLuint       GL_APIENTRY glCreateProgram (void);
-GL_APICALL GLuint       GL_APIENTRY glCreateShader (GLenum type);
-GL_APICALL void         GL_APIENTRY glCullFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glDeleteProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glDeleteShader (GLuint shader);
-GL_APICALL void         GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
-GL_APICALL void         GL_APIENTRY glDepthFunc (GLenum func);
-GL_APICALL void         GL_APIENTRY glDepthMask (GLboolean flag);
-GL_APICALL void         GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
-GL_APICALL void         GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
-GL_APICALL void         GL_APIENTRY glDisable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glDisableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
-GL_APICALL void         GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void* indices);
-GL_APICALL void         GL_APIENTRY glEnable (GLenum cap);
-GL_APICALL void         GL_APIENTRY glEnableVertexAttribArray (GLuint index);
-GL_APICALL void         GL_APIENTRY glFinish (void);
-GL_APICALL void         GL_APIENTRY glFlush (void);
-GL_APICALL void         GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GL_APICALL void         GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GL_APICALL void         GL_APIENTRY glFrontFace (GLenum mode);
-GL_APICALL void         GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
-GL_APICALL void         GL_APIENTRY glGenerateMipmap (GLenum target);
-GL_APICALL void         GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
-GL_APICALL void         GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
-GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
-GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const char* name);
-GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
-GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL GLenum       GL_APIENTRY glGetError (void);
-GL_APICALL void         GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
-GL_APICALL void         GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
-GL_APICALL void         GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-GL_APICALL void         GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
-GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
-GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
-GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const char* name);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void** pointer);
-GL_APICALL void         GL_APIENTRY glHint (GLenum target, GLenum mode);
-GL_APICALL GLboolean    GL_APIENTRY glIsBuffer (GLuint buffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsEnabled (GLenum cap);
-GL_APICALL GLboolean    GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsProgram (GLuint program);
-GL_APICALL GLboolean    GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
-GL_APICALL GLboolean    GL_APIENTRY glIsShader (GLuint shader);
-GL_APICALL GLboolean    GL_APIENTRY glIsTexture (GLuint texture);
-GL_APICALL void         GL_APIENTRY glLineWidth (GLfloat width);
-GL_APICALL void         GL_APIENTRY glLinkProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
-GL_APICALL void         GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
-GL_APICALL void         GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels);
-GL_APICALL void         GL_APIENTRY glReleaseShaderCompiler (void);
-GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
-GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length);
-GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const char** string, const GLint* length);
-GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
-GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat,  GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
-GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
-GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
-GL_APICALL void         GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
-GL_APICALL void         GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
-GL_APICALL void         GL_APIENTRY glUniform1f (GLint location, GLfloat x);
-GL_APICALL void         GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform1i (GLint location, GLint x);
-GL_APICALL void         GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
-GL_APICALL void         GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
-GL_APICALL void         GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void         GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
-GL_APICALL void         GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void         GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
-GL_APICALL void         GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void         GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
-GL_APICALL void         GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void         GL_APIENTRY glUseProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glValidateProgram (GLuint program);
-GL_APICALL void         GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
-GL_APICALL void         GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
-GL_APICALL void         GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void         GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
-GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl2_h_ */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2ext.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2ext.h
deleted file mode 100644
index 72f1ae7..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2ext.h
+++ /dev/null
@@ -1,518 +0,0 @@
-#ifndef __gl2ext_h_
-#define __gl2ext_h_
-
-/* $Revision: 8271 $ on $Date:: 2009-05-21 09:33:40 -0700 #$ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-#ifndef GL_APIENTRYP
-#   define GL_APIENTRYP GL_APIENTRY*
-#endif
-
-/*------------------------------------------------------------------------*
- * OES extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_ETC1_RGB8_OES                                        0x8D64
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_PALETTE4_RGB8_OES                                    0x8B90
-#define GL_PALETTE4_RGBA8_OES                                   0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
-#define GL_PALETTE4_RGBA4_OES                                   0x8B93
-#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
-#define GL_PALETTE8_RGB8_OES                                    0x8B95
-#define GL_PALETTE8_RGBA8_OES                                   0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
-#define GL_PALETTE8_RGBA4_OES                                   0x8B98
-#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_DEPTH_COMPONENT24_OES                                0x81A6
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_DEPTH_COMPONENT32_OES                                0x81A7
-#endif
-
-/* GL_OES_depth_texture */
-/* No new tokens introduced by this extension. */
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-typedef void* GLeglImageOES;
-#endif
-
-/* GL_OES_get_program_binary */
-#ifndef GL_OES_get_program_binary
-#define GL_PROGRAM_BINARY_LENGTH_OES                            0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS_OES                       0x87FE
-#define GL_PROGRAM_BINARY_FORMATS_OES                           0x87FF
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_WRITE_ONLY_OES                                       0x88B9
-#define GL_BUFFER_ACCESS_OES                                    0x88BB
-#define GL_BUFFER_MAPPED_OES                                    0x88BC
-#define GL_BUFFER_MAP_POINTER_OES                               0x88BD
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_DEPTH_STENCIL_OES                                    0x84F9
-#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
-#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
-#endif
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_RGB8_OES                                             0x8051
-#define GL_RGBA8_OES                                            0x8058
-#endif
-
-/* GL_OES_standard_derivatives */
-#ifndef GL_OES_standard_derivatives
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES                  0x8B8B
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_STENCIL_INDEX1_OES                                   0x8D46
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_STENCIL_INDEX4_OES                                   0x8D47
-#endif
-
-/* GL_OES_texture3D */
-#ifndef GL_OES_texture3D
-#define GL_TEXTURE_WRAP_R_OES                                   0x8072
-#define GL_TEXTURE_3D_OES                                       0x806F
-#define GL_TEXTURE_BINDING_3D_OES                               0x806A
-#define GL_MAX_3D_TEXTURE_SIZE_OES                              0x8073
-#define GL_SAMPLER_3D_OES                                       0x8B5F
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES        0x8CD4
-#endif
-
-/* GL_OES_texture_half_float */
-#ifndef GL_OES_texture_half_float
-#define GL_HALF_FLOAT_OES                                       0x8D61
-#endif
-
-/* GL_OES_vertex_half_float */
-/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */
-
-/* GL_OES_vertex_type_10_10_10_2 */
-#ifndef GL_OES_vertex_type_10_10_10_2
-#define GL_UNSIGNED_INT_10_10_10_2_OES                          0x8DF6
-#define GL_INT_10_10_10_2_OES                                   0x8DF7
-#endif
-
-/*------------------------------------------------------------------------*
- * AMD extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_3DC_X_AMD                                            0x87F9
-#define GL_3DC_XY_AMD                                           0x87FA
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_ATC_RGB_AMD                                          0x8C92
-#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD                          0x8C93
-#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD                      0x87EE
-#endif
-
-/* GL_AMD_program_binary_Z400 */
-#ifndef GL_AMD_program_binary_Z400
-#define GL_Z400_BINARY_AMD                                      0x8740
-#endif
-
-/* GL_AMD_performance_monitor */
-#ifndef GL_AMD_performance_monitor
-#define GL_COUNTER_TYPE_AMD                                     0x8BC0
-#define GL_COUNTER_RANGE_AMD                                    0x8BC1
-#define GL_UNSIGNED_INT64_AMD                                   0x8BC2
-#define GL_PERCENTAGE_AMD                                       0x8BC3
-#define GL_PERFMON_RESULT_AVAILABLE_AMD                         0x8BC4
-#define GL_PERFMON_RESULT_SIZE_AMD                              0x8BC5
-#define GL_PERFMON_RESULT_AMD                                   0x8BC6
-#endif
-
-/*------------------------------------------------------------------------*
- * EXT extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
-#endif
-
-/* GL_EXT_texture_type_2_10_10_10_REV */
-#ifndef GL_EXT_texture_type_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
-#endif
-
-/* GL_EXT_texture_format_BGRA8888 */
-#ifndef GL_EXT_texture_format_BGRA8888
-#define GL_BGRA                                                 0x80E1
-#endif
-
-/*------------------------------------------------------------------------*
- * IMG extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_IMG_read_format */
-#ifndef GL_IMG_read_format
-#define GL_BGRA                                                 0x80E1
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV                           0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV                           0x8366
-#endif
-
-/* GL_IMG_texture_compression_pvrtc */
-#ifndef GL_IMG_texture_compression_pvrtc
-#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG                      0x8C00
-#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG                      0x8C01
-#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG                     0x8C02
-#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG                     0x8C03
-#endif
-
-/*------------------------------------------------------------------------*
- * NV extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_NV_fence */
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV                                     0x84F2
-#define GL_FENCE_STATUS_NV                                      0x84F3
-#define GL_FENCE_CONDITION_NV                                   0x84F4
-#endif
-
-/*------------------------------------------------------------------------*
- * QCOM extension tokens
- *------------------------------------------------------------------------*/
-
-/* GL_QCOM_driver_control */
-/* No new tokens introduced by this extension. */
-
-/* GL_QCOM_perfmon_global_mode */
-#ifndef GL_QCOM_perfmon_global_mode
-#define GL_PERFMON_GLOBAL_MODE_QCOM                             0x8FA0
-#endif
-
-/*------------------------------------------------------------------------*
- * End of extension tokens, start of corresponding extension functions
- *------------------------------------------------------------------------*/
-
-/*------------------------------------------------------------------------*
- * OES extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_OES_compressed_ETC1_RGB8_texture */
-#ifndef GL_OES_compressed_ETC1_RGB8_texture
-#define GL_OES_compressed_ETC1_RGB8_texture 1
-#endif
-
-/* GL_OES_compressed_paletted_texture */
-#ifndef GL_OES_compressed_paletted_texture
-#define GL_OES_compressed_paletted_texture 1
-#endif
-
-/* GL_OES_EGL_image */
-#ifndef GL_OES_EGL_image
-#define GL_OES_EGL_image 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
-GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
-#endif
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
-#endif
-
-/* GL_OES_depth24 */
-#ifndef GL_OES_depth24
-#define GL_OES_depth24 1
-#endif
-
-/* GL_OES_depth32 */
-#ifndef GL_OES_depth32
-#define GL_OES_depth32 1
-#endif
-
-/* GL_OES_depth_texture */
-#ifndef GL_OES_depth_texture
-#define GL_OES_depth_texture 1
-#endif
-
-/* GL_OES_element_index_uint */
-#ifndef GL_OES_element_index_uint
-#define GL_OES_element_index_uint 1
-#endif
-
-/* GL_OES_fbo_render_mipmap */
-#ifndef GL_OES_fbo_render_mipmap
-#define GL_OES_fbo_render_mipmap 1
-#endif
-
-/* GL_OES_fragment_precision_high */
-#ifndef GL_OES_fragment_precision_high
-#define GL_OES_fragment_precision_high 1
-#endif
-
-/* GL_OES_get_program_binary */
-#ifndef GL_OES_get_program_binary
-#define GL_OES_get_program_binary 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const void *binary, GLint length);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLint length);
-#endif
-
-/* GL_OES_mapbuffer */
-#ifndef GL_OES_mapbuffer
-#define GL_OES_mapbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
-GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
-GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, void** params);
-#endif
-typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
-typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
-typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void** params);
-#endif
-
-/* GL_OES_packed_depth_stencil */
-#ifndef GL_OES_packed_depth_stencil
-#define GL_OES_packed_depth_stencil 1
-#endif
-
-/* GL_OES_rgb8_rgba8 */
-#ifndef GL_OES_rgb8_rgba8
-#define GL_OES_rgb8_rgba8 1
-#endif
-
-/* GL_OES_standard_derivatives */
-#ifndef GL_OES_standard_derivatives
-#define GL_OES_standard_derivatives 1
-#endif
-
-/* GL_OES_stencil1 */
-#ifndef GL_OES_stencil1
-#define GL_OES_stencil1 1
-#endif
-
-/* GL_OES_stencil4 */
-#ifndef GL_OES_stencil4
-#define GL_OES_stencil4 1
-#endif
-
-/* GL_OES_texture_3D */
-#ifndef GL_OES_texture_3D
-#define GL_OES_texture_3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels);
-GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
-GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-#endif
-typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
-typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-#endif
-
-/* GL_OES_texture_float_linear */
-#ifndef GL_OES_texture_float_linear
-#define GL_OES_texture_float_linear 1
-#endif
-
-/* GL_OES_texture_half_float_linear */
-#ifndef GL_OES_texture_half_float_linear
-#define GL_OES_texture_half_float_linear 1
-#endif
-
-/* GL_OES_texture_float */
-#ifndef GL_OES_texture_float
-#define GL_OES_texture_float 1
-#endif
-
-/* GL_OES_texture_half_float */
-#ifndef GL_OES_texture_half_float
-#define GL_OES_texture_half_float 1
-#endif
-
-/* GL_OES_texture_npot */
-#ifndef GL_OES_texture_npot
-#define GL_OES_texture_npot 1
-#endif
-
-/* GL_OES_vertex_half_float */
-#ifndef GL_OES_vertex_half_float
-#define GL_OES_vertex_half_float 1
-#endif
-
-/* GL_OES_vertex_type_10_10_10_2 */
-#ifndef GL_OES_vertex_type_10_10_10_2
-#define GL_OES_vertex_type_10_10_10_2 1
-#endif
-
-/*------------------------------------------------------------------------*
- * AMD extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_AMD_compressed_3DC_texture */
-#ifndef GL_AMD_compressed_3DC_texture
-#define GL_AMD_compressed_3DC_texture 1
-#endif
-
-/* GL_AMD_compressed_ATC_texture */
-#ifndef GL_AMD_compressed_ATC_texture
-#define GL_AMD_compressed_ATC_texture 1
-#endif
-
-/* GL_AMD_program_binary_Z400 */
-#ifndef GL_AMD_program_binary_Z400
-#define GL_AMD_program_binary_Z400 1
-#endif
-
-/* AMD_performance_monitor */
-#ifndef GL_AMD_performance_monitor
-#define GL_AMD_performance_monitor 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, char *groupString);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, char *counterString);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
-GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
-GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
-GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
-GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor);
-GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, char *groupString);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, char *counterString);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
-typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
-typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
-typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
-typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
-#endif
-
-/*------------------------------------------------------------------------*
- * EXT extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_EXT_texture_filter_anisotropic */
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-/* GL_EXT_texture_type_2_10_10_10_REV */
-#ifndef GL_EXT_texture_type_2_10_10_10_REV
-#define GL_EXT_texture_type_2_10_10_10_REV 1
-#endif
-
-/* GL_EXT_texture_format_BGRA8888 */
-#ifndef GL_EXT_texture_format_BGRA8888
-#define GL_EXT_texture_format_BGRA8888 1
-#endif
-
-/*------------------------------------------------------------------------*
- * IMG extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_IMG_read_format */
-#ifndef GL_IMG_read_format
-#define GL_IMG_read_format 1
-#endif
-
-/* GL_IMG_texture_compression_pvrtc */
-#ifndef GL_IMG_texture_compression_pvrtc
-#define GL_IMG_texture_compression_pvrtc 1
-#endif
-
-/*------------------------------------------------------------------------*
- * NV extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_NV_fence */
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
-GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
-GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);
-GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);
-GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
-GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint fence);
-GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
-#endif
-typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-/*------------------------------------------------------------------------*
- * QCOM extension functions
- *------------------------------------------------------------------------*/
-
-/* GL_QCOM_driver_control */
-#ifndef GL_QCOM_driver_control
-#define GL_QCOM_driver_control 1
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls);
-GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, char *driverControlString);
-GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl);
-GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl);
-#endif
-typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls);
-typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, char *driverControlString);
-typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
-typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
-#endif
-
-/* GL_QCOM_perfmon_global_mode */
-#ifndef GL_QCOM_perfmon_global_mode
-#define GL_QCOM_perfmon_global_mode 1
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl2ext_h_ */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2platform.h b/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2platform.h
deleted file mode 100644
index 3e9036c..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/GLES2/gl2platform.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __gl2platform_h_
-#define __gl2platform_h_
-
-/* $Revision: 7173 $ on $Date:: 2009-01-09 11:18:21 -0800 #$ */
-
-/*
- * This document is licensed under the SGI Free Software B License Version
- * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
- */
-
-/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
- * Last modified on 2008/12/19
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "OpenGL-ES" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
-#endif
-
-#define GL_APIENTRY KHRONOS_APIENTRY
-
-#endif /* __gl2platform_h_ */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/KHR/khrplatform.h b/ndk/platforms/android-5/arch-x86/usr/include/KHR/khrplatform.h
deleted file mode 100644
index 1660bd7..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/KHR/khrplatform.h
+++ /dev/null
@@ -1,243 +0,0 @@
-#ifndef __khrplatform_h_
-#define __khrplatform_h_
-
-/*
-** Copyright (c) 2008-2009 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Platform-specific types and definitions.
- * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
- * 
- * Adopters may modify this file to suit their platform. Adopters are
- * encouraged to submit platform specific modifications to the Khronos
- * group so that they can be included in future versions of this file.
- * Please submit changes by sending them to the public Khronos Bugzilla
- * (http://khronos.org/bugzilla) by filing a bug against product
- * "Khronos (general)" component "Registry".
- *
- * A predefined template which fills in some of the bug fields can be
- * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
- * must create a Bugzilla login first.
- * 
- *
- * See the Implementer's Guidelines for information about where this file
- * should be located on your system.
- *    http://www.khronos.org/registry/implementers_guide.pdf
- *
- * 
- * This file should be included as
- *        #include <KHR/khrplatform.h>
- * by the Khronos API header file that uses its types and defines.
- *
- * The types in this file should only be used to define API-specific types.
- * Types defined in this file:
- *    khronos_int8_t              signed   8  bit
- *    khronos_uint8_t             unsigned 8  bit
- *    khronos_int16_t             signed   16 bit
- *    khronos_uint16_t            unsigned 16 bit
- *    khronos_int32_t             signed   32 bit
- *    khronos_uint32_t            unsigned 32 bit
- *    khronos_int64_t             signed   64 bit
- *    khronos_uint64_t            unsigned 64 bit
- *    khronos_intptr_t            signed   same number of bits as a pointer
- *    khronos_uintptr_t           unsigned same number of bits as a pointer
- *    khronos_ssize_t             signed   size
- *    khronos_usize_t             unsigned size
- *    khronos_float_t             signed   32 bit floating point
- *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
- *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
- *                                         nanoseconds
- *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
- *
- * KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
- * KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
- * 
- *
- * Macros defined in this file:
- *    KHRONOS_APICALL
- *    KHRONOS_APIENTRY
- *    KHRONOS_APIATTRIBUTES
- * These may be used in function prototypes as:
- *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
- *                                  int arg1,
- *                                  int arg2) KHRONOS_APIATTRIBUTES;
- */
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APICALL
- *-------------------------------------------------------------------------
- * This precedes the return type of the function in the function prototype.
- */
-#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
-#   define KHRONOS_APICALL __declspec(dllimport)
-#elif defined (__SYMBIAN32__)
-#   define KHRONOS_APICALL IMPORT_C
-#elif defined(ANDROID)
-#   define KHRONOS_APICALL __attribute__((visibility("default")))
-#else
-#   define KHRONOS_APICALL
-#endif
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APIENTRY
- *-------------------------------------------------------------------------
- * This follows the return type of the function  and precedes the function
- * name in the function prototype.
- */
-#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
-    /* Win32 but not WinCE */
-#   define KHRONOS_APIENTRY __stdcall
-#else
-#   define KHRONOS_APIENTRY
-#endif
-
-/*-------------------------------------------------------------------------
- * Definition of KHRONOS_APIATTRIBUTES
- *-------------------------------------------------------------------------
- * This follows the closing parenthesis of the function prototype arguments.
- */
-#if defined (__ARMCC_2__)
-#define KHRONOS_APIATTRIBUTES __softfp
-#else
-#define KHRONOS_APIATTRIBUTES
-#endif
-
-/*-------------------------------------------------------------------------
- * basic type definitions
- *-----------------------------------------------------------------------*/
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
-
-
-/*
- * Using <stdint.h>
- */
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__VMS ) || defined(__sgi)
-
-/*
- * Using <inttypes.h>
- */
-#include <inttypes.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
-
-/*
- * Win32
- */
-typedef __int32                 khronos_int32_t;
-typedef unsigned __int32        khronos_uint32_t;
-typedef __int64                 khronos_int64_t;
-typedef unsigned __int64        khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif defined(__sun__) || defined(__digital__)
-
-/*
- * Sun or Digital
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#if defined(__arch64__) || defined(_LP64)
-typedef long int                khronos_int64_t;
-typedef unsigned long int       khronos_uint64_t;
-#else
-typedef long long int           khronos_int64_t;
-typedef unsigned long long int  khronos_uint64_t;
-#endif /* __arch64__ */
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#elif 0
-
-/*
- * Hypothetical platform with no float or int64 support
- */
-typedef int                     khronos_int32_t;
-typedef unsigned int            khronos_uint32_t;
-#define KHRONOS_SUPPORT_INT64   0
-#define KHRONOS_SUPPORT_FLOAT   0
-
-#else
-
-/*
- * Generic fallback
- */
-#include <stdint.h>
-typedef int32_t                 khronos_int32_t;
-typedef uint32_t                khronos_uint32_t;
-typedef int64_t                 khronos_int64_t;
-typedef uint64_t                khronos_uint64_t;
-#define KHRONOS_SUPPORT_INT64   1
-#define KHRONOS_SUPPORT_FLOAT   1
-
-#endif
-
-
-/*
- * Types that are (so far) the same on all platforms
- */
-typedef signed   char          khronos_int8_t;
-typedef unsigned char          khronos_uint8_t;
-typedef signed   short int     khronos_int16_t;
-typedef unsigned short int     khronos_uint16_t;
-typedef signed   long  int     khronos_intptr_t;
-typedef unsigned long  int     khronos_uintptr_t;
-typedef signed   long  int     khronos_ssize_t;
-typedef unsigned long  int     khronos_usize_t;
-
-#if KHRONOS_SUPPORT_FLOAT
-/*
- * Float type
- */
-typedef          float         khronos_float_t;
-#endif
-
-#if KHRONOS_SUPPORT_INT64
-/* Time types
- *
- * These types can be used to represent a time interval in nanoseconds or 
- * an absolute Unadjusted System Time.  Unadjusted System Time is the number 
- * of nanoseconds since some arbitrary system event (e.g. since the last 
- * time the system booted).  The Unadjusted System Time is an unsigned 
- * 64 bit value that wraps back to 0 every 584 years.  Time intervals 
- * may be either signed or unsigned.
- */
-typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
-typedef khronos_int64_t        khronos_stime_nanoseconds_t;
-#endif
-
-
-#endif /* __khrplatform_h_ */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/alloca.h b/ndk/platforms/android-5/arch-x86/usr/include/alloca.h
deleted file mode 100644
index 0c50fc3..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/alloca.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _ALLOCA_H
-#define _ALLOCA_H
-
-#define alloca(size)   __builtin_alloca(size)
-
-#endif /* _ALLOCA_H */
-
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/android/log.h b/ndk/platforms/android-5/arch-x86/usr/include/android/log.h
deleted file mode 100644
index 0ea4c29..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/android/log.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROID_LOG_H
-#define _ANDROID_LOG_H
-
-/******************************************************************
- *
- * IMPORTANT NOTICE:
- *
- *   This file is part of Android's set of stable system headers
- *   exposed by the Android NDK (Native Development Kit) since
- *   platform release 1.5
- *
- *   Third-party source AND binary code relies on the definitions
- *   here to be FROZEN ON ALL UPCOMING PLATFORM RELEASES.
- *
- *   - DO NOT MODIFY ENUMS (EXCEPT IF YOU ADD NEW 32-BIT VALUES)
- *   - DO NOT MODIFY CONSTANTS OR FUNCTIONAL MACROS
- *   - DO NOT CHANGE THE SIGNATURE OF FUNCTIONS IN ANY WAY
- *   - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
- */
-
-/*
- * Support routines to send messages to the Android in-kernel log buffer,
- * which can later be accessed through the 'logcat' utility.
- *
- * Each log message must have
- *   - a priority
- *   - a log tag
- *   - some text
- *
- * The tag normally corresponds to the component that emits the log message,
- * and should be reasonably small.
- *
- * Log message text may be truncated to less than an implementation-specific
- * limit (e.g. 1023 characters max).
- *
- * Note that a newline character ("\n") will be appended automatically to your
- * log message, if not already there. It is not possible to send several messages
- * and have them appear on a single line in logcat.
- *
- * PLEASE USE LOGS WITH MODERATION:
- *
- *  - Sending log messages eats CPU and slow down your application and the
- *    system.
- *
- *  - The circular log buffer is pretty small (<64KB), sending many messages
- *    might push off other important log messages from the rest of the system.
- *
- *  - In release builds, only send log messages to account for exceptional
- *    conditions.
- *
- * NOTE: These functions MUST be implemented by /system/lib/liblog.so
- */
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Android log priority values, in ascending priority order.
- */
-typedef enum android_LogPriority {
-    ANDROID_LOG_UNKNOWN = 0,
-    ANDROID_LOG_DEFAULT,    /* only for SetMinPriority() */
-    ANDROID_LOG_VERBOSE,
-    ANDROID_LOG_DEBUG,
-    ANDROID_LOG_INFO,
-    ANDROID_LOG_WARN,
-    ANDROID_LOG_ERROR,
-    ANDROID_LOG_FATAL,
-    ANDROID_LOG_SILENT,     /* only for SetMinPriority(); must be last */
-} android_LogPriority;
-
-/*
- * Send a simple string to the log.
- */
-int __android_log_write(int prio, const char *tag, const char *text);
-
-/*
- * Send a formatted string to the log, used like printf(fmt,...)
- */
-int __android_log_print(int prio, const char *tag,  const char *fmt, ...)
-#if defined(__GNUC__)
-    __attribute__ ((format(printf, 3, 4)))
-#endif
-    ;
-
-/*
- * A variant of __android_log_print() that takes a va_list to list
- * additional parameters.
- */
-int __android_log_vprint(int prio, const char *tag,
-                         const char *fmt, va_list ap);
-
-/*
- * Log an assertion failure and SIGTRAP the process to have a chance
- * to inspect it, if a debugger is attached. This uses the FATAL priority.
- */
-void __android_log_assert(const char *cond, const char *tag,
-			  const char *fmt, ...)    
-#if defined(__GNUC__)
-    __attribute__ ((noreturn))
-    __attribute__ ((format(printf, 3, 4)))
-#endif
-    ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ANDROID_LOG_H */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/arpa/inet.h b/ndk/platforms/android-5/arch-x86/usr/include/arpa/inet.h
deleted file mode 100644
index e78e7c5..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/arpa/inet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _ARPA_INET_H_
-#define _ARPA_INET_H_
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-
-__BEGIN_DECLS
-
-typedef uint32_t in_addr_t;
-
-extern uint32_t      inet_addr(const char *);
-
-extern int           inet_aton(const char *, struct in_addr *);
-extern char*         inet_ntoa(struct in_addr);
-
-extern int           inet_pton(int, const char *, void *);
-extern const char*   inet_ntop(int, const void *, char *, size_t);
-
-extern unsigned int  inet_nsap_addr(const char *, unsigned char *, int);
-extern char*         inet_nsap_ntoa(int, const unsigned char *, char *);
-
-__END_DECLS
-
-#endif /* _ARPA_INET_H_ */
-
-
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/arpa/nameser.h b/ndk/platforms/android-5/arch-x86/usr/include/arpa/nameser.h
deleted file mode 100644
index 028eadc..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/arpa/nameser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _arpa_nameser_h
-#define _arpa_nameser_h
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/* this header intentionally blank
- *
- * the definitions normally found in <arpa/nameser.h> are
- * really a bunch of resolver's internal declarations that
- * should not be exposed to client code in any way
- */
-
-#endif /* _arpa_nameser_h */
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/4level-fixup.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/4level-fixup.h
deleted file mode 100644
index 91ae7f4..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/4level-fixup.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _4LEVEL_FIXUP_H
-#define _4LEVEL_FIXUP_H
-
-#define __ARCH_HAS_4LEVEL_HACK
-#define __PAGETABLE_PUD_FOLDED
-
-#define PUD_SIZE PGDIR_SIZE
-#define PUD_MASK PGDIR_MASK
-#define PTRS_PER_PUD 1
-
-#define pud_t pgd_t
-
-#define pmd_alloc(mm, pud, address)   ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))?   NULL: pmd_offset(pud, address))
-
-#define pud_alloc(mm, pgd, address) (pgd)
-#define pud_offset(pgd, start) (pgd)
-#define pud_none(pud) 0
-#define pud_bad(pud) 0
-#define pud_present(pud) 1
-#define pud_ERROR(pud) do { } while (0)
-#define pud_clear(pud) pgd_clear(pud)
-
-#undef pud_free_tlb
-#define pud_free_tlb(tlb, x) do { } while (0)
-#define pud_free(x) do { } while (0)
-#define __pud_free_tlb(tlb, x) do { } while (0)
-
-#undef pud_addr_end
-#define pud_addr_end(addr, end) (end)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/audit_dir_write.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/audit_dir_write.h
deleted file mode 100644
index 1327b59..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/audit_dir_write.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/__ffs.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/__ffs.h
deleted file mode 100644
index 3d135bd..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/__ffs.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS___FFS_H_
-#define _ASM_GENERIC_BITOPS___FFS_H_
-
-#include <asm/types.h>
-
-#if BITS_PER_LONG == 64
-#endif
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/atomic.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/atomic.h
deleted file mode 100644
index 5f53ba9..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/atomic.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_ATOMIC_H_
-#define _ASM_GENERIC_BITOPS_ATOMIC_H_
-
-#include <asm/types.h>
-
-#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-
-#define _atomic_spin_lock_irqsave(l,f) do { local_irq_save(f); } while (0)
-#define _atomic_spin_unlock_irqrestore(l,f) do { local_irq_restore(f); } while (0)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/ffz.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/ffz.h
deleted file mode 100644
index 18da271..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/ffz.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FFZ_H_
-#define _ASM_GENERIC_BITOPS_FFZ_H_
-
-#define ffz(x) __ffs(~(x))
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/find.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/find.h
deleted file mode 100644
index 8361cfe..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/find.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FIND_H_
-#define _ASM_GENERIC_BITOPS_FIND_H_
-
-#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
-#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls.h
deleted file mode 100644
index 8adbf31..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FLS_H_
-#define _ASM_GENERIC_BITOPS_FLS_H_
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls64.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls64.h
deleted file mode 100644
index af77098..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/fls64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
-#define _ASM_GENERIC_BITOPS_FLS64_H_
-
-#include <asm/types.h>
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/le.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/le.h
deleted file mode 100644
index 97ca973..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/le.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_LE_H_
-#define _ASM_GENERIC_BITOPS_LE_H_
-
-#include <asm/types.h>
-#include <asm/byteorder.h>
-
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-#define BITOP_LE_SWIZZLE ((BITS_PER_LONG-1) & ~0x7)
-
-#ifdef __LITTLE_ENDIAN
-
-#define generic_test_le_bit(nr, addr) test_bit(nr, addr)
-#define generic___set_le_bit(nr, addr) __set_bit(nr, addr)
-#define generic___clear_le_bit(nr, addr) __clear_bit(nr, addr)
-
-#define generic_test_and_set_le_bit(nr, addr) test_and_set_bit(nr, addr)
-#define generic_test_and_clear_le_bit(nr, addr) test_and_clear_bit(nr, addr)
-
-#define generic___test_and_set_le_bit(nr, addr) __test_and_set_bit(nr, addr)
-#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit(nr, addr)
-
-#define generic_find_next_zero_le_bit(addr, size, offset) find_next_zero_bit(addr, size, offset)
-
-#elif defined(__BIG_ENDIAN)
-
-#define generic_test_le_bit(nr, addr)   test_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___set_le_bit(nr, addr)   __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___clear_le_bit(nr, addr)   __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic_test_and_set_le_bit(nr, addr)   test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic_test_and_clear_le_bit(nr, addr)   test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#define generic___test_and_set_le_bit(nr, addr)   __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define generic___test_and_clear_le_bit(nr, addr)   __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-
-#define generic_find_first_zero_le_bit(addr, size)   generic_find_next_zero_le_bit((addr), (size), 0)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/non-atomic.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/non-atomic.h
deleted file mode 100644
index 727f736..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bitops/non-atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
-#define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
-
-#include <asm/types.h>
-
-#define BITOP_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
-#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bug.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bug.h
deleted file mode 100644
index d91a135..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/bug.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_BUG_H
-#define _ASM_GENERIC_BUG_H
-
-#include <linux/compiler.h>
-
-#ifndef HAVE_ARCH_BUG
-#define BUG()
-#endif
-
-#ifndef HAVE_ARCH_BUG_ON
-#define BUG_ON(condition) do { if (condition) ; } while(0)
-#endif
-
-#ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) do { if (condition) ; } while(0)
-#endif
-
-#define WARN_ON_ONCE(condition)  ({   static int __warn_once = 1;   int __ret = 0;     if (unlikely((condition) && __warn_once)) {   __warn_once = 0;   WARN_ON(1);   __ret = 1;   }   __ret;  })
-
-#define WARN_ON_SMP(x) do { } while (0)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/cputime.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/cputime.h
deleted file mode 100644
index 0486b87..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/cputime.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_CPUTIME_H
-#define _ASM_GENERIC_CPUTIME_H
-
-#include <linux/time.h>
-#include <linux/jiffies.h>
-
-typedef unsigned long cputime_t;
-
-#define cputime_zero (0UL)
-#define cputime_max ((~0UL >> 1) - 1)
-#define cputime_add(__a, __b) ((__a) + (__b))
-#define cputime_sub(__a, __b) ((__a) - (__b))
-#define cputime_div(__a, __n) ((__a) / (__n))
-#define cputime_halve(__a) ((__a) >> 1)
-#define cputime_eq(__a, __b) ((__a) == (__b))
-#define cputime_gt(__a, __b) ((__a) > (__b))
-#define cputime_ge(__a, __b) ((__a) >= (__b))
-#define cputime_lt(__a, __b) ((__a) < (__b))
-#define cputime_le(__a, __b) ((__a) <= (__b))
-#define cputime_to_jiffies(__ct) (__ct)
-#define jiffies_to_cputime(__hz) (__hz)
-
-typedef u64 cputime64_t;
-
-#define cputime64_zero (0ULL)
-#define cputime64_add(__a, __b) ((__a) + (__b))
-#define cputime64_sub(__a, __b) ((__a) - (__b))
-#define cputime64_to_jiffies64(__ct) (__ct)
-#define jiffies64_to_cputime64(__jif) (__jif)
-#define cputime_to_cputime64(__ct) ((u64) __ct)
-
-#define cputime_to_msecs(__ct) jiffies_to_msecs(__ct)
-#define msecs_to_cputime(__msecs) msecs_to_jiffies(__msecs)
-
-#define cputime_to_secs(jif) ((jif) / HZ)
-#define secs_to_cputime(sec) ((sec) * HZ)
-
-#define timespec_to_cputime(__val) timespec_to_jiffies(__val)
-#define cputime_to_timespec(__ct,__val) jiffies_to_timespec(__ct,__val)
-
-#define timeval_to_cputime(__val) timeval_to_jiffies(__val)
-#define cputime_to_timeval(__ct,__val) jiffies_to_timeval(__ct,__val)
-
-#define cputime_to_clock_t(__ct) jiffies_to_clock_t(__ct)
-#define clock_t_to_cputime(__x) clock_t_to_jiffies(__x)
-
-#define cputime64_to_clock_t(__ct) jiffies_64_to_clock_t(__ct)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/emergency-restart.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/emergency-restart.h
deleted file mode 100644
index 619c682..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/emergency-restart.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
-#define _ASM_GENERIC_EMERGENCY_RESTART_H
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno-base.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno-base.h
deleted file mode 100644
index 2fb4a33..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno-base.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_ERRNO_BASE_H
-#define _ASM_GENERIC_ERRNO_BASE_H
-
-#define EPERM 1  
-#define ENOENT 2  
-#define ESRCH 3  
-#define EINTR 4  
-#define EIO 5  
-#define ENXIO 6  
-#define E2BIG 7  
-#define ENOEXEC 8  
-#define EBADF 9  
-#define ECHILD 10  
-#define EAGAIN 11  
-#define ENOMEM 12  
-#define EACCES 13  
-#define EFAULT 14  
-#define ENOTBLK 15  
-#define EBUSY 16  
-#define EEXIST 17  
-#define EXDEV 18  
-#define ENODEV 19  
-#define ENOTDIR 20  
-#define EISDIR 21  
-#define EINVAL 22  
-#define ENFILE 23  
-#define EMFILE 24  
-#define ENOTTY 25  
-#define ETXTBSY 26  
-#define EFBIG 27  
-#define ENOSPC 28  
-#define ESPIPE 29  
-#define EROFS 30  
-#define EMLINK 31  
-#define EPIPE 32  
-#define EDOM 33  
-#define ERANGE 34  
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno.h
deleted file mode 100644
index 11dd00f..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/errno.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_ERRNO_H
-#define _ASM_GENERIC_ERRNO_H
-
-#include <asm-generic/errno-base.h>
-
-#define EDEADLK 35  
-#define ENAMETOOLONG 36  
-#define ENOLCK 37  
-#define ENOSYS 38  
-#define ENOTEMPTY 39  
-#define ELOOP 40  
-#define EWOULDBLOCK EAGAIN  
-#define ENOMSG 42  
-#define EIDRM 43  
-#define ECHRNG 44  
-#define EL2NSYNC 45  
-#define EL3HLT 46  
-#define EL3RST 47  
-#define ELNRNG 48  
-#define EUNATCH 49  
-#define ENOCSI 50  
-#define EL2HLT 51  
-#define EBADE 52  
-#define EBADR 53  
-#define EXFULL 54  
-#define ENOANO 55  
-#define EBADRQC 56  
-#define EBADSLT 57  
-
-#define EDEADLOCK EDEADLK
-
-#define EBFONT 59  
-#define ENOSTR 60  
-#define ENODATA 61  
-#define ETIME 62  
-#define ENOSR 63  
-#define ENONET 64  
-#define ENOPKG 65  
-#define EREMOTE 66  
-#define ENOLINK 67  
-#define EADV 68  
-#define ESRMNT 69  
-#define ECOMM 70  
-#define EPROTO 71  
-#define EMULTIHOP 72  
-#define EDOTDOT 73  
-#define EBADMSG 74  
-#define EOVERFLOW 75  
-#define ENOTUNIQ 76  
-#define EBADFD 77  
-#define EREMCHG 78  
-#define ELIBACC 79  
-#define ELIBBAD 80  
-#define ELIBSCN 81  
-#define ELIBMAX 82  
-#define ELIBEXEC 83  
-#define EILSEQ 84  
-#define ERESTART 85  
-#define ESTRPIPE 86  
-#define EUSERS 87  
-#define ENOTSOCK 88  
-#define EDESTADDRREQ 89  
-#define EMSGSIZE 90  
-#define EPROTOTYPE 91  
-#define ENOPROTOOPT 92  
-#define EPROTONOSUPPORT 93  
-#define ESOCKTNOSUPPORT 94  
-#define EOPNOTSUPP 95  
-#define EPFNOSUPPORT 96  
-#define EAFNOSUPPORT 97  
-#define EADDRINUSE 98  
-#define EADDRNOTAVAIL 99  
-#define ENETDOWN 100  
-#define ENETUNREACH 101  
-#define ENETRESET 102  
-#define ECONNABORTED 103  
-#define ECONNRESET 104  
-#define ENOBUFS 105  
-#define EISCONN 106  
-#define ENOTCONN 107  
-#define ESHUTDOWN 108  
-#define ETOOMANYREFS 109  
-#define ETIMEDOUT 110  
-#define ECONNREFUSED 111  
-#define EHOSTDOWN 112  
-#define EHOSTUNREACH 113  
-#define EALREADY 114  
-#define EINPROGRESS 115  
-#define ESTALE 116  
-#define EUCLEAN 117  
-#define ENOTNAM 118  
-#define ENAVAIL 119  
-#define EISNAM 120  
-#define EREMOTEIO 121  
-#define EDQUOT 122  
-
-#define ENOMEDIUM 123  
-#define EMEDIUMTYPE 124  
-#define ECANCELED 125  
-#define ENOKEY 126  
-#define EKEYEXPIRED 127  
-#define EKEYREVOKED 128  
-#define EKEYREJECTED 129  
-
-#define EOWNERDEAD 130  
-#define ENOTRECOVERABLE 131  
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/fcntl.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/fcntl.h
deleted file mode 100644
index a53b536..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/fcntl.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_FCNTL_H
-#define _ASM_GENERIC_FCNTL_H
-
-#include <linux/types.h>
-
-#define O_ACCMODE 00000003
-#define O_RDONLY 00000000
-#define O_WRONLY 00000001
-#define O_RDWR 00000002
-#ifndef O_CREAT
-#define O_CREAT 00000100  
-#endif
-#ifndef O_EXCL
-#define O_EXCL 00000200  
-#endif
-#ifndef O_NOCTTY
-#define O_NOCTTY 00000400  
-#endif
-#ifndef O_TRUNC
-#define O_TRUNC 00001000  
-#endif
-#ifndef O_APPEND
-#define O_APPEND 00002000
-#endif
-#ifndef O_NONBLOCK
-#define O_NONBLOCK 00004000
-#endif
-#ifndef O_SYNC
-#define O_SYNC 00010000
-#endif
-#ifndef FASYNC
-#define FASYNC 00020000  
-#endif
-#ifndef O_DIRECT
-#define O_DIRECT 00040000  
-#endif
-#ifndef O_LARGEFILE
-#define O_LARGEFILE 00100000
-#endif
-#ifndef O_DIRECTORY
-#define O_DIRECTORY 00200000  
-#endif
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW 00400000  
-#endif
-#ifndef O_NOATIME
-#define O_NOATIME 01000000
-#endif
-#ifndef O_NDELAY
-#define O_NDELAY O_NONBLOCK
-#endif
-
-#define F_DUPFD 0  
-#define F_GETFD 1  
-#define F_SETFD 2  
-#define F_GETFL 3  
-#define F_SETFL 4  
-#ifndef F_GETLK
-#define F_GETLK 5
-#define F_SETLK 6
-#define F_SETLKW 7
-#endif
-#ifndef F_SETOWN
-#define F_SETOWN 8  
-#define F_GETOWN 9  
-#endif
-#ifndef F_SETSIG
-#define F_SETSIG 10  
-#define F_GETSIG 11  
-#endif
-
-#define FD_CLOEXEC 1  
-
-#ifndef F_RDLCK
-#define F_RDLCK 0
-#define F_WRLCK 1
-#define F_UNLCK 2
-#endif
-
-#ifndef F_EXLCK
-#define F_EXLCK 4  
-#define F_SHLCK 8  
-#endif
-
-#ifndef F_INPROGRESS
-#define F_INPROGRESS 16
-#endif
-
-#define LOCK_SH 1  
-#define LOCK_EX 2  
-#define LOCK_NB 4  
-#define LOCK_UN 8  
-
-#define LOCK_MAND 32  
-#define LOCK_READ 64  
-#define LOCK_WRITE 128  
-#define LOCK_RW 192  
-
-#define F_LINUX_SPECIFIC_BASE 1024
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK
-#ifndef __ARCH_FLOCK_PAD
-#define __ARCH_FLOCK_PAD
-#endif
-
-struct flock {
- short l_type;
- short l_whence;
- off_t l_start;
- off_t l_len;
- pid_t l_pid;
- __ARCH_FLOCK_PAD
-};
-#endif
-
-#ifndef F_GETLK64
-#define F_GETLK64 12  
-#define F_SETLK64 13
-#define F_SETLKW64 14
-#endif
-
-#ifndef HAVE_ARCH_STRUCT_FLOCK64
-#ifndef __ARCH_FLOCK64_PAD
-#define __ARCH_FLOCK64_PAD
-#endif
-
-struct flock64 {
- short l_type;
- short l_whence;
- loff_t l_start;
- loff_t l_len;
- pid_t l_pid;
- __ARCH_FLOCK64_PAD
-};
-#endif
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/futex.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/futex.h
deleted file mode 100644
index 05d3afe..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/futex.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_FUTEX_H
-#define _ASM_GENERIC_FUTEX_H
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ioctl.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ioctl.h
deleted file mode 100644
index cba2b8e..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ioctl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_IOCTL_H
-#define _ASM_GENERIC_IOCTL_H
-
-#define _IOC_NRBITS 8
-#define _IOC_TYPEBITS 8
-#define _IOC_SIZEBITS 14
-#define _IOC_DIRBITS 2
-
-#define _IOC_NRMASK ((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK ((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK ((1 << _IOC_DIRBITS)-1)
-
-#define _IOC_NRSHIFT 0
-#define _IOC_TYPESHIFT (_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT (_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT (_IOC_SIZESHIFT+_IOC_SIZEBITS)
-
-#define _IOC_NONE 0U
-#define _IOC_WRITE 1U
-#define _IOC_READ 2U
-
-#define _IOC(dir,type,nr,size)   (((dir) << _IOC_DIRSHIFT) |   ((type) << _IOC_TYPESHIFT) |   ((nr) << _IOC_NRSHIFT) |   ((size) << _IOC_SIZESHIFT))
-
-extern unsigned int __invalid_size_argument_for_IOC;
-#define _IOC_TYPECHECK(t)   ((sizeof(t) == sizeof(t[1]) &&   sizeof(t) < (1 << _IOC_SIZEBITS)) ?   sizeof(t) : __invalid_size_argument_for_IOC)
-
-#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
-#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
-#define _IOR_BAD(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size))
-#define _IOW_BAD(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-
-#define _IOC_DIR(nr) (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-#define _IOC_TYPE(nr) (((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-#define _IOC_NR(nr) (((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-#define _IOC_SIZE(nr) (((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-
-#define IOC_IN (_IOC_WRITE << _IOC_DIRSHIFT)
-#define IOC_OUT (_IOC_READ << _IOC_DIRSHIFT)
-#define IOC_INOUT ((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT)
-#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ipc.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ipc.h
deleted file mode 100644
index 57657a7..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/ipc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_IPC_H
-#define _ASM_GENERIC_IPC_H
-
-struct ipc_kludge {
- struct msgbuf __user *msgp;
- long msgtyp;
-};
-
-#define SEMOP 1
-#define SEMGET 2
-#define SEMCTL 3
-#define SEMTIMEDOP 4
-#define MSGSND 11
-#define MSGRCV 12
-#define MSGGET 13
-#define MSGCTL 14
-#define SHMAT 21
-#define SHMDT 22
-#define SHMGET 23
-#define SHMCTL 24
-
-#define DIPC 25
-
-#define IPCCALL(version,op) ((version)<<16 | (op))
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/local.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/local.h
deleted file mode 100644
index cae0d54..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/local.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_LOCAL_H
-#define _ASM_GENERIC_LOCAL_H
-
-#include <linux/percpu.h>
-#include <linux/hardirq.h>
-#include <asm/atomic.h>
-#include <asm/types.h>
-
-typedef struct
-{
- atomic_long_t a;
-} local_t;
-
-#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
-
-#define local_read(l) atomic_long_read(&(l)->a)
-#define local_set(l,i) atomic_long_set((&(l)->a),(i))
-#define local_inc(l) atomic_long_inc(&(l)->a)
-#define local_dec(l) atomic_long_dec(&(l)->a)
-#define local_add(i,l) atomic_long_add((i),(&(l)->a))
-#define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
-
-#define __local_inc(l) local_set((l), local_read(l) + 1)
-#define __local_dec(l) local_set((l), local_read(l) - 1)
-#define __local_add(i,l) local_set((l), local_read(l) + (i))
-#define __local_sub(i,l) local_set((l), local_read(l) - (i))
-
-#define cpu_local_read(v) local_read(&__get_cpu_var(v))
-#define cpu_local_set(v, i) local_set(&__get_cpu_var(v), (i))
-#define cpu_local_inc(v) local_inc(&__get_cpu_var(v))
-#define cpu_local_dec(v) local_dec(&__get_cpu_var(v))
-#define cpu_local_add(i, v) local_add((i), &__get_cpu_var(v))
-#define cpu_local_sub(i, v) local_sub((i), &__get_cpu_var(v))
-
-#define __cpu_local_inc(v) __local_inc(&__get_cpu_var(v))
-#define __cpu_local_dec(v) __local_dec(&__get_cpu_var(v))
-#define __cpu_local_add(i, v) __local_add((i), &__get_cpu_var(v))
-#define __cpu_local_sub(i, v) __local_sub((i), &__get_cpu_var(v))
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/memory_model.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/memory_model.h
deleted file mode 100644
index fa7602e..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/memory_model.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef __ASM_MEMORY_MODEL_H
-#define __ASM_MEMORY_MODEL_H
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mman.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mman.h
deleted file mode 100644
index 98d2783..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mman.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_MMAN_H
-#define _ASM_GENERIC_MMAN_H
-
-#define PROT_READ 0x1  
-#define PROT_WRITE 0x2  
-#define PROT_EXEC 0x4  
-#define PROT_SEM 0x8  
-#define PROT_NONE 0x0  
-#define PROT_GROWSDOWN 0x01000000  
-#define PROT_GROWSUP 0x02000000  
-
-#define MAP_SHARED 0x01  
-#define MAP_PRIVATE 0x02  
-#define MAP_TYPE 0x0f  
-#define MAP_FIXED 0x10  
-#define MAP_ANONYMOUS 0x20  
-
-#define MS_ASYNC 1  
-#define MS_INVALIDATE 2  
-#define MS_SYNC 4  
-
-#define MADV_NORMAL 0  
-#define MADV_RANDOM 1  
-#define MADV_SEQUENTIAL 2  
-#define MADV_WILLNEED 3  
-#define MADV_DONTNEED 4  
-
-#define MADV_REMOVE 9  
-#define MADV_DONTFORK 10  
-#define MADV_DOFORK 11  
-
-#define MAP_ANON MAP_ANONYMOUS
-#define MAP_FILE 0
-
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mutex-xchg.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mutex-xchg.h
deleted file mode 100644
index 63a557e..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/mutex-xchg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_MUTEX_XCHG_H
-#define _ASM_GENERIC_MUTEX_XCHG_H
-
-#define __mutex_slowpath_needs_to_unlock() 0
-#endif
diff --git a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/percpu.h b/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/percpu.h
deleted file mode 100644
index e498300..0000000
--- a/ndk/platforms/android-5/arch-x86/usr/include/asm-generic/percpu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _ASM_GENERIC_PERCPU_H_
-#define _ASM_GENERIC_PERCPU_H_
-#include <linux/compiler.h>
-
-#define __GENERIC_PER_CPU
-
-#define DEFINE_PER_CPU(type, name)   __typeof__(type) per_cpu__##name
-
-#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var))
-#define __get_cpu_var(var) per_cpu__##var
-#define __raw_get_cpu_var(var) per_cpu__##var
-
-#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
-
-#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per