diff --git a/aarch64-linux-android/lib64/libatomic.a b/aarch64-linux-android/lib64/libatomic.a
index fdee12a..1dba43c 100644
--- a/aarch64-linux-android/lib64/libatomic.a
+++ b/aarch64-linux-android/lib64/libatomic.a
Binary files differ
diff --git a/aarch64-linux-android/lib64/libgomp.a b/aarch64-linux-android/lib64/libgomp.a
index e7afbc8..efb0fa7 100644
--- a/aarch64-linux-android/lib64/libgomp.a
+++ b/aarch64-linux-android/lib64/libgomp.a
Binary files differ
diff --git a/bin/aarch64-linux-android-addr2line b/bin/aarch64-linux-android-addr2line
index 31050a1..b21414f 100755
--- a/bin/aarch64-linux-android-addr2line
+++ b/bin/aarch64-linux-android-addr2line
Binary files differ
diff --git a/bin/aarch64-linux-android-ar b/bin/aarch64-linux-android-ar
index c8e7c33..c415ebd 100755
--- a/bin/aarch64-linux-android-ar
+++ b/bin/aarch64-linux-android-ar
Binary files differ
diff --git a/bin/aarch64-linux-android-as b/bin/aarch64-linux-android-as
index 6a2294a..3d5f60f 100755
--- a/bin/aarch64-linux-android-as
+++ b/bin/aarch64-linux-android-as
Binary files differ
diff --git a/bin/aarch64-linux-android-c++filt b/bin/aarch64-linux-android-c++filt
index 19f5ca3..c1df846 100755
--- a/bin/aarch64-linux-android-c++filt
+++ b/bin/aarch64-linux-android-c++filt
Binary files differ
diff --git a/bin/aarch64-linux-android-cpp b/bin/aarch64-linux-android-cpp
index 1cffcac..5a066e5 100755
--- a/bin/aarch64-linux-android-cpp
+++ b/bin/aarch64-linux-android-cpp
Binary files differ
diff --git a/bin/aarch64-linux-android-dwp b/bin/aarch64-linux-android-dwp
index 7e0233b..8a2b8c1 100755
--- a/bin/aarch64-linux-android-dwp
+++ b/bin/aarch64-linux-android-dwp
Binary files differ
diff --git a/bin/aarch64-linux-android-elfedit b/bin/aarch64-linux-android-elfedit
index f2e9bf6..054067b 100755
--- a/bin/aarch64-linux-android-elfedit
+++ b/bin/aarch64-linux-android-elfedit
Binary files differ
diff --git a/bin/aarch64-linux-android-g++ b/bin/aarch64-linux-android-g++
index 4165e3e..c7045a4 100755
--- a/bin/aarch64-linux-android-g++
+++ b/bin/aarch64-linux-android-g++
Binary files differ
diff --git a/bin/aarch64-linux-android-gcc b/bin/aarch64-linux-android-gcc
index a607020..1da6739 100755
--- a/bin/aarch64-linux-android-gcc
+++ b/bin/aarch64-linux-android-gcc
Binary files differ
diff --git a/bin/aarch64-linux-android-gcc-4.9.x b/bin/aarch64-linux-android-gcc-4.9.x
new file mode 100755
index 0000000..1da6739
--- /dev/null
+++ b/bin/aarch64-linux-android-gcc-4.9.x
Binary files differ
diff --git a/bin/aarch64-linux-android-gcc-ar b/bin/aarch64-linux-android-gcc-ar
index f95bc0f..3fd989f 100755
--- a/bin/aarch64-linux-android-gcc-ar
+++ b/bin/aarch64-linux-android-gcc-ar
Binary files differ
diff --git a/bin/aarch64-linux-android-gcc-nm b/bin/aarch64-linux-android-gcc-nm
index 08506f8..49aa92b 100755
--- a/bin/aarch64-linux-android-gcc-nm
+++ b/bin/aarch64-linux-android-gcc-nm
Binary files differ
diff --git a/bin/aarch64-linux-android-gcc-ranlib b/bin/aarch64-linux-android-gcc-ranlib
index bdfae9f..e55dc59 100755
--- a/bin/aarch64-linux-android-gcc-ranlib
+++ b/bin/aarch64-linux-android-gcc-ranlib
Binary files differ
diff --git a/bin/aarch64-linux-android-gcov b/bin/aarch64-linux-android-gcov
index 7ad032b..281a629 100755
--- a/bin/aarch64-linux-android-gcov
+++ b/bin/aarch64-linux-android-gcov
Binary files differ
diff --git a/bin/aarch64-linux-android-gcov-tool b/bin/aarch64-linux-android-gcov-tool
index 655388c..e2a3ae5 100755
--- a/bin/aarch64-linux-android-gcov-tool
+++ b/bin/aarch64-linux-android-gcov-tool
Binary files differ
diff --git a/bin/aarch64-linux-android-gprof b/bin/aarch64-linux-android-gprof
index 031b241..28609bc 100755
--- a/bin/aarch64-linux-android-gprof
+++ b/bin/aarch64-linux-android-gprof
Binary files differ
diff --git a/bin/aarch64-linux-android-ld.bfd b/bin/aarch64-linux-android-ld.bfd
index 37d08c1..ea9c0c0 100755
--- a/bin/aarch64-linux-android-ld.bfd
+++ b/bin/aarch64-linux-android-ld.bfd
Binary files differ
diff --git a/bin/aarch64-linux-android-ld.gold b/bin/aarch64-linux-android-ld.gold
index b2263e8..6e48409 100755
--- a/bin/aarch64-linux-android-ld.gold
+++ b/bin/aarch64-linux-android-ld.gold
Binary files differ
diff --git a/bin/aarch64-linux-android-nm b/bin/aarch64-linux-android-nm
index 32e31ca..5df914c 100755
--- a/bin/aarch64-linux-android-nm
+++ b/bin/aarch64-linux-android-nm
Binary files differ
diff --git a/bin/aarch64-linux-android-objcopy b/bin/aarch64-linux-android-objcopy
index 9c13f41..db82485 100755
--- a/bin/aarch64-linux-android-objcopy
+++ b/bin/aarch64-linux-android-objcopy
Binary files differ
diff --git a/bin/aarch64-linux-android-objdump b/bin/aarch64-linux-android-objdump
index d35aa20..b68a76c 100755
--- a/bin/aarch64-linux-android-objdump
+++ b/bin/aarch64-linux-android-objdump
Binary files differ
diff --git a/bin/aarch64-linux-android-ranlib b/bin/aarch64-linux-android-ranlib
index 0907d11..d12e936 100755
--- a/bin/aarch64-linux-android-ranlib
+++ b/bin/aarch64-linux-android-ranlib
Binary files differ
diff --git a/bin/aarch64-linux-android-readelf b/bin/aarch64-linux-android-readelf
index 80c695f..3c25ddc 100755
--- a/bin/aarch64-linux-android-readelf
+++ b/bin/aarch64-linux-android-readelf
Binary files differ
diff --git a/bin/aarch64-linux-android-size b/bin/aarch64-linux-android-size
index c975f33..aad6605 100755
--- a/bin/aarch64-linux-android-size
+++ b/bin/aarch64-linux-android-size
Binary files differ
diff --git a/bin/aarch64-linux-android-strings b/bin/aarch64-linux-android-strings
index 63826b1..8c65f83 100755
--- a/bin/aarch64-linux-android-strings
+++ b/bin/aarch64-linux-android-strings
Binary files differ
diff --git a/bin/aarch64-linux-android-strip b/bin/aarch64-linux-android-strip
index c26fc4e..687b852 100755
--- a/bin/aarch64-linux-android-strip
+++ b/bin/aarch64-linux-android-strip
Binary files differ
diff --git a/bin/aarch64-linux-androidkernel-strip b/bin/aarch64-linux-androidkernel-strip
new file mode 120000
index 0000000..98f9e52
--- /dev/null
+++ b/bin/aarch64-linux-androidkernel-strip
@@ -0,0 +1 @@
+aarch64-linux-android-strip
\ No newline at end of file
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o b/lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o
similarity index 85%
rename from lib/gcc/aarch64-linux-android/4.9/crtbegin.o
rename to lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o
index 24207fd..f0a9320 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o
+++ b/lib/gcc/aarch64-linux-android/4.9.x/crtbegin.o
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o b/lib/gcc/aarch64-linux-android/4.9.x/crtbeginS.o
similarity index 87%
rename from lib/gcc/aarch64-linux-android/4.9/crtbeginS.o
rename to lib/gcc/aarch64-linux-android/4.9.x/crtbeginS.o
index d711742..e69fad8 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbeginS.o
+++ b/lib/gcc/aarch64-linux-android/4.9.x/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o b/lib/gcc/aarch64-linux-android/4.9.x/crtbeginT.o
similarity index 85%
copy from lib/gcc/aarch64-linux-android/4.9/crtbegin.o
copy to lib/gcc/aarch64-linux-android/4.9.x/crtbeginT.o
index 24207fd..f0a9320 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtbegin.o
+++ b/lib/gcc/aarch64-linux-android/4.9.x/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtend.o b/lib/gcc/aarch64-linux-android/4.9.x/crtend.o
similarity index 72%
rename from lib/gcc/aarch64-linux-android/4.9/crtend.o
rename to lib/gcc/aarch64-linux-android/4.9.x/crtend.o
index b34bb9c..d4350c9 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtend.o
+++ b/lib/gcc/aarch64-linux-android/4.9.x/crtend.o
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtend.o b/lib/gcc/aarch64-linux-android/4.9.x/crtendS.o
similarity index 72%
copy from lib/gcc/aarch64-linux-android/4.9/crtend.o
copy to lib/gcc/aarch64-linux-android/4.9.x/crtendS.o
index b34bb9c..d4350c9 100644
--- a/lib/gcc/aarch64-linux-android/4.9/crtend.o
+++ b/lib/gcc/aarch64-linux-android/4.9.x/crtendS.o
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-counter.def b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-counter.def
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-counter.def
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-counter.def
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-io.c b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-io.c
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-io.c
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-io.c
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-io.h b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-io.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-io.h
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-io.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-iov.h b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-iov.h
similarity index 72%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-iov.h
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-iov.h
index d6e33b7..0da8e1d 100644
--- a/lib/gcc/aarch64-linux-android/4.9/gcov-src/gcov-iov.h
+++ b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/gcov-iov.h
@@ -1,4 +1,4 @@
 /* Generated automatically by the program `build/gcov-iov'
-   from `4.9 (4 9) and prerelease (*)'.  */
+   from `4.9.x (4 9) and prerelease (*)'.  */
 
 #define GCOV_VERSION ((gcov_unsigned_t)0x3430392a)  /* 409* */
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-driver-kernel.c b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-driver-kernel.c
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-driver-kernel.c
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-driver-kernel.c
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-driver.c b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-driver.c
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-driver.c
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-driver.c
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-kernel.h b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-kernel.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-kernel.h
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-kernel.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-merge.c b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-merge.c
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-merge.c
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-merge.c
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-profiler.c b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-profiler.c
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov-profiler.c
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov-profiler.c
diff --git a/lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov.h b/lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/gcov-src/libgcov.h
rename to lib/gcc/aarch64-linux-android/4.9.x/gcov-src/libgcov.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include-fixed/README b/lib/gcc/aarch64-linux-android/4.9.x/include-fixed/README
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include-fixed/README
rename to lib/gcc/aarch64-linux-android/4.9.x/include-fixed/README
diff --git a/lib/gcc/aarch64-linux-android/4.9/include-fixed/limits.h b/lib/gcc/aarch64-linux-android/4.9.x/include-fixed/limits.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include-fixed/limits.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include-fixed/limits.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include-fixed/linux/a.out.h b/lib/gcc/aarch64-linux-android/4.9.x/include-fixed/linux/a.out.h
similarity index 98%
rename from lib/gcc/aarch64-linux-android/4.9/include-fixed/linux/a.out.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include-fixed/linux/a.out.h
index 6b8ead0..148f8c6 100644
--- a/lib/gcc/aarch64-linux-android/4.9/include-fixed/linux/a.out.h
+++ b/lib/gcc/aarch64-linux-android/4.9.x/include-fixed/linux/a.out.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/tmp/8bf1fa4a69e1670b34d7855ef9cf731f/sysroot/usr/include/linux/a.out.h"
+	"/tmp/8ee0b8157b3409c4b84fff35696d6c90/sysroot/usr/include/linux/a.out.h"
 
     This had to be done to correct non-standard usages in the
     original, manufacturer supplied header file.  */
diff --git a/lib/gcc/aarch64-linux-android/4.9/include-fixed/syslimits.h b/lib/gcc/aarch64-linux-android/4.9.x/include-fixed/syslimits.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include-fixed/syslimits.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include-fixed/syslimits.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h b/lib/gcc/aarch64-linux-android/4.9.x/include/arm_neon.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/arm_neon.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/arm_neon.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/float.h b/lib/gcc/aarch64-linux-android/4.9.x/include/float.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/float.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/float.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/iso646.h b/lib/gcc/aarch64-linux-android/4.9.x/include/iso646.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/iso646.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/iso646.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/omp.h b/lib/gcc/aarch64-linux-android/4.9.x/include/omp.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/omp.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/omp.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdalign.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdalign.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdalign.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdalign.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdarg.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdarg.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdarg.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdarg.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdatomic.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdatomic.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdatomic.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdatomic.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdbool.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdbool.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdbool.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdbool.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stddef.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stddef.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stddef.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stddef.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdfix.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdfix.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdfix.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdfix.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdint-gcc.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdint-gcc.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdint-gcc.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdint-gcc.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdint.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdint.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdint.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdint.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/stdnoreturn.h b/lib/gcc/aarch64-linux-android/4.9.x/include/stdnoreturn.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/stdnoreturn.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/stdnoreturn.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/unwind.h b/lib/gcc/aarch64-linux-android/4.9.x/include/unwind.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/unwind.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/unwind.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/include/varargs.h b/lib/gcc/aarch64-linux-android/4.9.x/include/varargs.h
similarity index 100%
rename from lib/gcc/aarch64-linux-android/4.9/include/varargs.h
rename to lib/gcc/aarch64-linux-android/4.9.x/include/varargs.h
diff --git a/lib/gcc/aarch64-linux-android/4.9/libgcc.a b/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a
similarity index 65%
rename from lib/gcc/aarch64-linux-android/4.9/libgcc.a
rename to lib/gcc/aarch64-linux-android/4.9.x/libgcc.a
index 997d755..a177043 100644
--- a/lib/gcc/aarch64-linux-android/4.9/libgcc.a
+++ b/lib/gcc/aarch64-linux-android/4.9.x/libgcc.a
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/libgcov.a b/lib/gcc/aarch64-linux-android/4.9.x/libgcov.a
similarity index 72%
rename from lib/gcc/aarch64-linux-android/4.9/libgcov.a
rename to lib/gcc/aarch64-linux-android/4.9.x/libgcov.a
index f3ba355..211cd11 100644
--- a/lib/gcc/aarch64-linux-android/4.9/libgcov.a
+++ b/lib/gcc/aarch64-linux-android/4.9.x/libgcov.a
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o b/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o
deleted file mode 100644
index 24207fd..0000000
--- a/lib/gcc/aarch64-linux-android/4.9/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/aarch64-linux-android/4.9/crtendS.o b/lib/gcc/aarch64-linux-android/4.9/crtendS.o
deleted file mode 100644
index b34bb9c..0000000
--- a/lib/gcc/aarch64-linux-android/4.9/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9.x/cc1 b/libexec/gcc/aarch64-linux-android/4.9.x/cc1
new file mode 100755
index 0000000..3fecccb
--- /dev/null
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/cc1
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9.x/cc1plus b/libexec/gcc/aarch64-linux-android/4.9.x/cc1plus
new file mode 100755
index 0000000..3771feb
--- /dev/null
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/cc1plus
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/collect2 b/libexec/gcc/aarch64-linux-android/4.9.x/collect2
similarity index 99%
rename from libexec/gcc/aarch64-linux-android/4.9/collect2
rename to libexec/gcc/aarch64-linux-android/4.9.x/collect2
index 527dc55..1ea79a3 100755
--- a/libexec/gcc/aarch64-linux-android/4.9/collect2
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/collect2
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so b/libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so
rename to libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so
diff --git a/libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so.0 b/libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so.0
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so.0
rename to libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so.0
diff --git a/libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so.0.0.0 b/libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/libfunction_reordering_plugin.so.0.0.0
rename to libexec/gcc/aarch64-linux-android/4.9.x/libfunction_reordering_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so b/libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so
rename to libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so
diff --git a/libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so.0 b/libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so.0
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so.0
rename to libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so.0
diff --git a/libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so.0.0.0 b/libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/aarch64-linux-android/4.9/liblto_plugin.so.0.0.0
rename to libexec/gcc/aarch64-linux-android/4.9.x/liblto_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9.x/lto-wrapper b/libexec/gcc/aarch64-linux-android/4.9.x/lto-wrapper
new file mode 100755
index 0000000..a59909b
--- /dev/null
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9.x/lto1 b/libexec/gcc/aarch64-linux-android/4.9.x/lto1
new file mode 100755
index 0000000..44c178d
--- /dev/null
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/lto1
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/plugin/gengtype b/libexec/gcc/aarch64-linux-android/4.9.x/plugin/gengtype
similarity index 99%
rename from libexec/gcc/aarch64-linux-android/4.9/plugin/gengtype
rename to libexec/gcc/aarch64-linux-android/4.9.x/plugin/gengtype
index 4cdfb24..99cf1d0 100755
--- a/libexec/gcc/aarch64-linux-android/4.9/plugin/gengtype
+++ b/libexec/gcc/aarch64-linux-android/4.9.x/plugin/gengtype
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/cc1 b/libexec/gcc/aarch64-linux-android/4.9/cc1
deleted file mode 100755
index f021545..0000000
--- a/libexec/gcc/aarch64-linux-android/4.9/cc1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/cc1plus b/libexec/gcc/aarch64-linux-android/4.9/cc1plus
deleted file mode 100755
index 992038c..0000000
--- a/libexec/gcc/aarch64-linux-android/4.9/cc1plus
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/lto-wrapper b/libexec/gcc/aarch64-linux-android/4.9/lto-wrapper
deleted file mode 100755
index 7093ad4..0000000
--- a/libexec/gcc/aarch64-linux-android/4.9/lto-wrapper
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/aarch64-linux-android/4.9/lto1 b/libexec/gcc/aarch64-linux-android/4.9/lto1
deleted file mode 100755
index 397367d..0000000
--- a/libexec/gcc/aarch64-linux-android/4.9/lto1
+++ /dev/null
Binary files differ
diff --git a/repo.prop b/repo.prop
index 18c5fd0..594eb9a 100644
--- a/repo.prop
+++ b/repo.prop
@@ -1,14 +1,14 @@
 platform/manifest 29325e7007f581fc689a14b68b0feb04f52e3d0f
-platform/ndk c73baafb98cff1887448f7358b16955ad277ef51
+platform/ndk dcc0b23ef2681dfe06c101a271a9ccb982288638
 platform/prebuilts/gcc/darwin-x86/host/headers 4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68
 platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1 ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e
 platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8 1273431a189717842f033573eb8c777e13dd88b7
-platform/prebuilts/ndk d02c5d372b38f063b2d7cb4d5351e6f4f2d3320a
-toolchain/binutils 48ba8648ee02f246c4fb286d7918f750c2b4ea4f
+platform/prebuilts/ndk 9cf98827acc9a95857ebdab2cd0d15e8a647509e
+toolchain/binutils 066607388945f542727bd5035fb8d84bfd798034
 toolchain/build f280657461aee54b6d2807881d8a77832f4e794c
 toolchain/cloog 604793eab97d360aef729f064674569ee6dbf3e1
 toolchain/expat 40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5
-toolchain/gcc 098157a754787181cfa10e71325832448ddcea98
+toolchain/gcc 1641488ea2548cf9c5e61ef5a2f914aa496f9870
 toolchain/gmp b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810
 toolchain/isl 0ccf95726af8ce58ad61ff474addbce3a31ba99c
 toolchain/mpc 835d16e92eed875638a8b5d552034c3b1aae045b