diff --git a/ide/eclipse/android-include-paths.xml b/ide/eclipse/android-include-paths.xml
index bb038a241..0e60642f8 100644
--- a/ide/eclipse/android-include-paths.xml
+++ b/ide/eclipse/android-include-paths.xml
@@ -4,8 +4,7 @@
 <language name="holder for library settings">
 
 </language>
-<language name="GNU C++">
-<includepath>${ProjDirPath}/prebuilt/darwin-x86/toolchain/arm-linux-androideabi-4.4.x/lib/gcc/arm-linux-androideabi/4.4.3/include</includepath>
+<language name="Assembly">
 <includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
 <includepath>${ProjDirPath}/system/core/include</includepath>
 <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
@@ -17,21 +16,41 @@
 <includepath>${ProjDirPath}/bionic/libm/include</includepath>
 <includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
 <includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
 <includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
 <includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
 <includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/base/include</includepath>
 <includepath>${ProjDirPath}/frameworks/native/include</includepath>
 <includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include/core</includepath>
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
+
+</language>
+<language name="GNU C++">
+<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
+<includepath>${ProjDirPath}/system/core/include</includepath>
+<includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
+<includepath>${ProjDirPath}/bionic/libc/include</includepath>
+<includepath>${ProjDirPath}/bionic/libstdc++/include</includepath>
+<includepath>${ProjDirPath}/bionic/libc/kernel/common</includepath>
+<includepath>${ProjDirPath}/bionic/libc/kernel/common/linux</includepath>
+<includepath>${ProjDirPath}/bionic/libc/kernel/arch-arm</includepath>
+<includepath>${ProjDirPath}/bionic/libm/include</includepath>
+<includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
+<includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
+<includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
+<includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
+<includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/base/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
+<includepath>${ProjDirPath}/external/skia/include</includepath>
+<includepath>${ProjDirPath}/external/skia/include/core</includepath>
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
 
 </language>
 <language name="GNU C">
-<includepath>${ProjDirPath}/prebuilt/darwin-x86/toolchain/arm-linux-androideabi-4.4.x/lib/gcc/arm-linux-androideabi/4.4.3/include</includepath>
 <includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
 <includepath>${ProjDirPath}/system/core/include</includepath>
 <includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
@@ -43,43 +62,15 @@
 <includepath>${ProjDirPath}/bionic/libm/include</includepath>
 <includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
 <includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
 <includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
 <includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
 <includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/base/include</includepath>
 <includepath>${ProjDirPath}/frameworks/native/include</includepath>
 <includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
-<includepath>${ProjDirPath}/external/skia/include</includepath>
-<includepath>${ProjDirPath}/external/skia/include/core</includepath>
-
-</language>
-<language name="Assembly">
-<includepath>${ProjDirPath}/prebuilt/darwin-x86/toolchain/arm-linux-androideabi-4.4.x/lib/gcc/arm-linux-androideabi/4.4.3/include</includepath>
-<includepath>${ProjDirPath}/system/core/include/arch/linux-arm</includepath>
-<includepath>${ProjDirPath}/system/core/include</includepath>
-<includepath>${ProjDirPath}/bionic/libc/arch-arm/include</includepath>
-<includepath>${ProjDirPath}/bionic/libc/include</includepath>
-<includepath>${ProjDirPath}/bionic/libstdc++/include</includepath>
-<includepath>${ProjDirPath}/bionic/libc/kernel/common</includepath>
-<includepath>${ProjDirPath}/bionic/libc/kernel/common/linux</includepath>
-<includepath>${ProjDirPath}/bionic/libc/kernel/arch-arm</includepath>
-<includepath>${ProjDirPath}/bionic/libm/include</includepath>
-<includepath>${ProjDirPath}/bionic/libm/include/arm</includepath>
-<includepath>${ProjDirPath}/bionic/libthread_db/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include</includepath>
-<includepath>${ProjDirPath}/dalvik/libnativehelper/include/nativehelper</includepath>
-<includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
-<includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
-<includepath>${ProjDirPath}/hardware/ril/include</includepath>
-<includepath>${ProjDirPath}/frameworks/native/include</includepath>
-<includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include</includepath>
 <includepath>${ProjDirPath}/external/skia/include/core</includepath>
+<includepath>${ProjDirPath}/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6/lib/gcc/arm-linux-androideabi/4.6.x-google/include</includepath>
 
 </language>
 </section>