diff --git a/bin/x86_64-linux-android-addr2line b/bin/x86_64-linux-android-addr2line
index ed70848..3bcdaec 100755
--- a/bin/x86_64-linux-android-addr2line
+++ b/bin/x86_64-linux-android-addr2line
Binary files differ
diff --git a/bin/x86_64-linux-android-ar b/bin/x86_64-linux-android-ar
index 864d96a..2a4ceb1 100755
--- a/bin/x86_64-linux-android-ar
+++ b/bin/x86_64-linux-android-ar
Binary files differ
diff --git a/bin/x86_64-linux-android-as b/bin/x86_64-linux-android-as
index ece3865..3097d16 100755
--- a/bin/x86_64-linux-android-as
+++ b/bin/x86_64-linux-android-as
Binary files differ
diff --git a/bin/x86_64-linux-android-c++filt b/bin/x86_64-linux-android-c++filt
index 775c993..060b93b 100755
--- a/bin/x86_64-linux-android-c++filt
+++ b/bin/x86_64-linux-android-c++filt
Binary files differ
diff --git a/bin/x86_64-linux-android-cpp b/bin/x86_64-linux-android-cpp
index d5cb460..003c768 100755
--- a/bin/x86_64-linux-android-cpp
+++ b/bin/x86_64-linux-android-cpp
Binary files differ
diff --git a/bin/x86_64-linux-android-dwp b/bin/x86_64-linux-android-dwp
index 409c773..4f0d1d4 100755
--- a/bin/x86_64-linux-android-dwp
+++ b/bin/x86_64-linux-android-dwp
Binary files differ
diff --git a/bin/x86_64-linux-android-elfedit b/bin/x86_64-linux-android-elfedit
index f2e9bf6..054067b 100755
--- a/bin/x86_64-linux-android-elfedit
+++ b/bin/x86_64-linux-android-elfedit
Binary files differ
diff --git a/bin/x86_64-linux-android-g++ b/bin/x86_64-linux-android-g++
index 5403e98..c025b90 100755
--- a/bin/x86_64-linux-android-g++
+++ b/bin/x86_64-linux-android-g++
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc b/bin/x86_64-linux-android-gcc
index dae36b8..d604688 100755
--- a/bin/x86_64-linux-android-gcc
+++ b/bin/x86_64-linux-android-gcc
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc-4.9.x b/bin/x86_64-linux-android-gcc-4.9.x
new file mode 100755
index 0000000..d604688
--- /dev/null
+++ b/bin/x86_64-linux-android-gcc-4.9.x
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc-ar b/bin/x86_64-linux-android-gcc-ar
index 3fbc64c..8bd5680 100755
--- a/bin/x86_64-linux-android-gcc-ar
+++ b/bin/x86_64-linux-android-gcc-ar
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc-nm b/bin/x86_64-linux-android-gcc-nm
index 9ae8272..c1428cc 100755
--- a/bin/x86_64-linux-android-gcc-nm
+++ b/bin/x86_64-linux-android-gcc-nm
Binary files differ
diff --git a/bin/x86_64-linux-android-gcc-ranlib b/bin/x86_64-linux-android-gcc-ranlib
index 86a12ce..93d744c 100755
--- a/bin/x86_64-linux-android-gcc-ranlib
+++ b/bin/x86_64-linux-android-gcc-ranlib
Binary files differ
diff --git a/bin/x86_64-linux-android-gcov b/bin/x86_64-linux-android-gcov
index e3a7a8a..c1f441c 100755
--- a/bin/x86_64-linux-android-gcov
+++ b/bin/x86_64-linux-android-gcov
Binary files differ
diff --git a/bin/x86_64-linux-android-gcov-tool b/bin/x86_64-linux-android-gcov-tool
index 6c7e9ec..ce5aeed 100755
--- a/bin/x86_64-linux-android-gcov-tool
+++ b/bin/x86_64-linux-android-gcov-tool
Binary files differ
diff --git a/bin/x86_64-linux-android-gprof b/bin/x86_64-linux-android-gprof
index b8a9079..9e168bc 100755
--- a/bin/x86_64-linux-android-gprof
+++ b/bin/x86_64-linux-android-gprof
Binary files differ
diff --git a/bin/x86_64-linux-android-ld.bfd b/bin/x86_64-linux-android-ld.bfd
index 796c605..3505a75 100755
--- a/bin/x86_64-linux-android-ld.bfd
+++ b/bin/x86_64-linux-android-ld.bfd
Binary files differ
diff --git a/bin/x86_64-linux-android-ld.gold b/bin/x86_64-linux-android-ld.gold
index 8c983aa..7f5035d 100755
--- a/bin/x86_64-linux-android-ld.gold
+++ b/bin/x86_64-linux-android-ld.gold
Binary files differ
diff --git a/bin/x86_64-linux-android-nm b/bin/x86_64-linux-android-nm
index 767b3a6..65c56d7 100755
--- a/bin/x86_64-linux-android-nm
+++ b/bin/x86_64-linux-android-nm
Binary files differ
diff --git a/bin/x86_64-linux-android-objcopy b/bin/x86_64-linux-android-objcopy
index fa66b8d..5e24a19 100755
--- a/bin/x86_64-linux-android-objcopy
+++ b/bin/x86_64-linux-android-objcopy
Binary files differ
diff --git a/bin/x86_64-linux-android-objdump b/bin/x86_64-linux-android-objdump
index 9f72ddd..c4266cb 100755
--- a/bin/x86_64-linux-android-objdump
+++ b/bin/x86_64-linux-android-objdump
Binary files differ
diff --git a/bin/x86_64-linux-android-ranlib b/bin/x86_64-linux-android-ranlib
index d837937..2c6e234 100755
--- a/bin/x86_64-linux-android-ranlib
+++ b/bin/x86_64-linux-android-ranlib
Binary files differ
diff --git a/bin/x86_64-linux-android-readelf b/bin/x86_64-linux-android-readelf
index 80c695f..3c25ddc 100755
--- a/bin/x86_64-linux-android-readelf
+++ b/bin/x86_64-linux-android-readelf
Binary files differ
diff --git a/bin/x86_64-linux-android-size b/bin/x86_64-linux-android-size
index 263d979..de8d992 100755
--- a/bin/x86_64-linux-android-size
+++ b/bin/x86_64-linux-android-size
Binary files differ
diff --git a/bin/x86_64-linux-android-strings b/bin/x86_64-linux-android-strings
index 809c498..c0fd059 100755
--- a/bin/x86_64-linux-android-strings
+++ b/bin/x86_64-linux-android-strings
Binary files differ
diff --git a/bin/x86_64-linux-android-strip b/bin/x86_64-linux-android-strip
index e927d69..2f04c8b 100755
--- a/bin/x86_64-linux-android-strip
+++ b/bin/x86_64-linux-android-strip
Binary files differ
diff --git a/bin/x86_64-linux-androidkernel-strip b/bin/x86_64-linux-androidkernel-strip
new file mode 120000
index 0000000..69d0bf5
--- /dev/null
+++ b/bin/x86_64-linux-androidkernel-strip
@@ -0,0 +1 @@
+x86_64-linux-android-strip
\ No newline at end of file
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbegin.o
new file mode 100644
index 0000000..35cf85d
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbegin.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginS.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginS.o
new file mode 100644
index 0000000..9dab4dc
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginT.o
new file mode 100644
index 0000000..35cf85d
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtend.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtend.o
new file mode 100644
index 0000000..8c55215
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtend.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtendS.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtendS.o
new file mode 100644
index 0000000..8c55215
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtendS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtfastmath.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtfastmath.o
new file mode 100644
index 0000000..c41eb9b
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec32.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec32.o
new file mode 100644
index 0000000..f30e691
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec32.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec64.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec64.o
new file mode 100644
index 0000000..087723f
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec64.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec80.o b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec80.o
new file mode 100644
index 0000000..3771e40
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/crtprec80.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/libgcc.a b/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a
similarity index 86%
rename from lib/gcc/x86_64-linux-android/4.9/32/libgcc.a
rename to lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a
index e0bb10f..c7dd5cd 100644
--- a/lib/gcc/x86_64-linux-android/4.9/32/libgcc.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/libgcc.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/libgcov.a b/lib/gcc/x86_64-linux-android/4.9.x/32/libgcov.a
similarity index 63%
rename from lib/gcc/x86_64-linux-android/4.9/32/libgcov.a
rename to lib/gcc/x86_64-linux-android/4.9.x/32/libgcov.a
index a3c827a..6833474 100644
--- a/lib/gcc/x86_64-linux-android/4.9/32/libgcov.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/32/libgcov.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o
new file mode 100644
index 0000000..20edaaa
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtbegin.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtbeginS.o b/lib/gcc/x86_64-linux-android/4.9.x/crtbeginS.o
similarity index 83%
rename from lib/gcc/x86_64-linux-android/4.9/crtbeginS.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtbeginS.o
index 54a425e..271a171 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtbeginS.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9.x/crtbeginT.o
new file mode 100644
index 0000000..20edaaa
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtend.o b/lib/gcc/x86_64-linux-android/4.9.x/crtend.o
similarity index 71%
rename from lib/gcc/x86_64-linux-android/4.9/crtend.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtend.o
index 901ec57..545e87d 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtend.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtend.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtend.o b/lib/gcc/x86_64-linux-android/4.9.x/crtendS.o
similarity index 71%
copy from lib/gcc/x86_64-linux-android/4.9/crtend.o
copy to lib/gcc/x86_64-linux-android/4.9.x/crtendS.o
index 901ec57..545e87d 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtend.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtendS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtfastmath.o b/lib/gcc/x86_64-linux-android/4.9.x/crtfastmath.o
similarity index 83%
rename from lib/gcc/x86_64-linux-android/4.9/crtfastmath.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtfastmath.o
index 14ff5ad..8ecde89 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtfastmath.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtprec32.o b/lib/gcc/x86_64-linux-android/4.9.x/crtprec32.o
similarity index 79%
rename from lib/gcc/x86_64-linux-android/4.9/crtprec32.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtprec32.o
index 92e7afd..7afb6ba 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtprec32.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtprec32.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtprec64.o b/lib/gcc/x86_64-linux-android/4.9.x/crtprec64.o
similarity index 81%
rename from lib/gcc/x86_64-linux-android/4.9/crtprec64.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtprec64.o
index 6381e37..88edae8 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtprec64.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtprec64.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtprec80.o b/lib/gcc/x86_64-linux-android/4.9.x/crtprec80.o
similarity index 79%
rename from lib/gcc/x86_64-linux-android/4.9/crtprec80.o
rename to lib/gcc/x86_64-linux-android/4.9.x/crtprec80.o
index c533b7f..ea6802d 100644
--- a/lib/gcc/x86_64-linux-android/4.9/crtprec80.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/crtprec80.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-counter.def b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-counter.def
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-counter.def
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-counter.def
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-io.c b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-io.c
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-io.c
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-io.c
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-io.h b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-io.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-io.h
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-io.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-iov.h b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-iov.h
similarity index 72%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-iov.h
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/gcov-iov.h
index d6e33b7..0da8e1d 100644
--- a/lib/gcc/x86_64-linux-android/4.9/gcov-src/gcov-iov.h
+++ b/lib/gcc/x86_64-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/x86_64-linux-android/4.9/gcov-src/libgcov-driver-kernel.c b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-driver-kernel.c
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-driver-kernel.c
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-driver-kernel.c
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-driver.c b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-driver.c
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-driver.c
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-driver.c
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-kernel.h b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-kernel.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-kernel.h
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-kernel.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-merge.c b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-merge.c
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-merge.c
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-merge.c
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-profiler.c b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-profiler.c
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov-profiler.c
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov-profiler.c
diff --git a/lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov.h b/lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/gcov-src/libgcov.h
rename to lib/gcc/x86_64-linux-android/4.9.x/gcov-src/libgcov.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include-fixed/README b/lib/gcc/x86_64-linux-android/4.9.x/include-fixed/README
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include-fixed/README
rename to lib/gcc/x86_64-linux-android/4.9.x/include-fixed/README
diff --git a/lib/gcc/x86_64-linux-android/4.9/include-fixed/limits.h b/lib/gcc/x86_64-linux-android/4.9.x/include-fixed/limits.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include-fixed/limits.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include-fixed/limits.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include-fixed/linux/a.out.h b/lib/gcc/x86_64-linux-android/4.9.x/include-fixed/linux/a.out.h
similarity index 98%
rename from lib/gcc/x86_64-linux-android/4.9/include-fixed/linux/a.out.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include-fixed/linux/a.out.h
index 244ce52..69aa6ac 100644
--- a/lib/gcc/x86_64-linux-android/4.9/include-fixed/linux/a.out.h
+++ b/lib/gcc/x86_64-linux-android/4.9.x/include-fixed/linux/a.out.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/tmp/c2fb136041d18cddb80da00d85c805c2/sysroot/usr/include/linux/a.out.h"
+	"/tmp/ca8b1ea984a04012a16bb19760bc0d9a/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/x86_64-linux-android/4.9/include-fixed/syslimits.h b/lib/gcc/x86_64-linux-android/4.9.x/include-fixed/syslimits.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include-fixed/syslimits.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include-fixed/syslimits.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/adxintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/adxintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/adxintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/adxintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/ammintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/ammintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/ammintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/ammintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/arm_neon.h b/lib/gcc/x86_64-linux-android/4.9.x/include/arm_neon.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/arm_neon.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/arm_neon.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avx2intrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avx2intrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avx2intrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avx2intrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avx512cdintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avx512cdintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avx512cdintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avx512cdintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avx512erintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avx512erintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avx512erintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avx512erintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avx512fintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avx512fintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avx512fintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avx512fintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avx512pfintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avx512pfintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avx512pfintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avx512pfintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/avxintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/avxintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/avxintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/avxintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/bmi2intrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/bmi2intrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/bmi2intrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/bmi2intrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/bmiintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/bmiintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/bmiintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/bmiintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/bmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/bmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/bmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/bmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/cpuid.h b/lib/gcc/x86_64-linux-android/4.9.x/include/cpuid.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/cpuid.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/cpuid.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/cross-stdarg.h b/lib/gcc/x86_64-linux-android/4.9.x/include/cross-stdarg.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/cross-stdarg.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/cross-stdarg.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/emmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/emmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/emmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/emmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/f16cintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/f16cintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/f16cintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/f16cintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/float.h b/lib/gcc/x86_64-linux-android/4.9.x/include/float.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/float.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/float.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/fma4intrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/fma4intrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/fma4intrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/fma4intrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/fmaintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/fmaintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/fmaintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/fmaintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/fxsrintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/fxsrintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/fxsrintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/fxsrintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/ia32intrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/ia32intrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/ia32intrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/ia32intrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/immintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/immintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/immintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/immintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/iso646.h b/lib/gcc/x86_64-linux-android/4.9.x/include/iso646.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/iso646.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/iso646.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/lwpintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/lwpintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/lwpintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/lwpintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/lzcntintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/lzcntintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/lzcntintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/lzcntintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/mm3dnow.h b/lib/gcc/x86_64-linux-android/4.9.x/include/mm3dnow.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/mm3dnow.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/mm3dnow.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/mm_malloc.h b/lib/gcc/x86_64-linux-android/4.9.x/include/mm_malloc.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/mm_malloc.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/mm_malloc.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/mmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/mmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/mmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/mmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/nmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/nmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/nmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/nmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/omp.h b/lib/gcc/x86_64-linux-android/4.9.x/include/omp.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/omp.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/omp.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/pmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/pmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/pmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/pmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/popcntintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/popcntintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/popcntintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/popcntintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/prfchwintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/prfchwintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/prfchwintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/prfchwintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/quadmath.h b/lib/gcc/x86_64-linux-android/4.9.x/include/quadmath.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/quadmath.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/quadmath.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/quadmath_weak.h b/lib/gcc/x86_64-linux-android/4.9.x/include/quadmath_weak.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/quadmath_weak.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/quadmath_weak.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/rdseedintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/rdseedintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/rdseedintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/rdseedintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/rtmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/rtmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/rtmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/rtmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/shaintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/shaintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/shaintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/shaintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/smmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/smmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/smmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/smmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdalign.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdalign.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdalign.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdalign.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdarg.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdarg.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdarg.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdarg.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdatomic.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdatomic.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdatomic.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdatomic.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdbool.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdbool.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdbool.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdbool.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stddef.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stddef.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stddef.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stddef.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdfix.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdfix.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdfix.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdfix.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdint-gcc.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdint-gcc.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdint-gcc.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdint-gcc.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdint.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdint.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdint.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdint.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/stdnoreturn.h b/lib/gcc/x86_64-linux-android/4.9.x/include/stdnoreturn.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/stdnoreturn.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/stdnoreturn.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/tbmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/tbmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/tbmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/tbmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/tmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/tmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/tmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/tmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/unwind.h b/lib/gcc/x86_64-linux-android/4.9.x/include/unwind.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/unwind.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/unwind.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/varargs.h b/lib/gcc/x86_64-linux-android/4.9.x/include/varargs.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/varargs.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/varargs.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/wmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/wmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/wmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/wmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/x86intrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/x86intrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/x86intrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/x86intrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/xmmintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/xmmintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/xmmintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/xmmintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/xopintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/xopintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/xopintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/xopintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/xsaveintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/xsaveintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/xsaveintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/xsaveintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/xsaveoptintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/xsaveoptintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/xsaveoptintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/xsaveoptintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/include/xtestintrin.h b/lib/gcc/x86_64-linux-android/4.9.x/include/xtestintrin.h
similarity index 100%
rename from lib/gcc/x86_64-linux-android/4.9/include/xtestintrin.h
rename to lib/gcc/x86_64-linux-android/4.9.x/include/xtestintrin.h
diff --git a/lib/gcc/x86_64-linux-android/4.9/libgcc.a b/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a
similarity index 90%
rename from lib/gcc/x86_64-linux-android/4.9/libgcc.a
rename to lib/gcc/x86_64-linux-android/4.9.x/libgcc.a
index a004869..dd91736 100644
--- a/lib/gcc/x86_64-linux-android/4.9/libgcc.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/libgcc.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/libgcov.a b/lib/gcc/x86_64-linux-android/4.9.x/libgcov.a
similarity index 71%
rename from lib/gcc/x86_64-linux-android/4.9/libgcov.a
rename to lib/gcc/x86_64-linux-android/4.9.x/libgcov.a
index b9ae04a..5db5db8 100644
--- a/lib/gcc/x86_64-linux-android/4.9/libgcov.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/libgcov.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbegin.o
new file mode 100644
index 0000000..1fa96aa
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbegin.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtbeginS.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginS.o
similarity index 77%
rename from lib/gcc/x86_64-linux-android/4.9/x32/crtbeginS.o
rename to lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginS.o
index 738204b..cc2097c 100644
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtbeginS.o
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginT.o
new file mode 100644
index 0000000..1fa96aa
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtend.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtend.o
new file mode 100644
index 0000000..9eec870
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtend.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtendS.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtendS.o
new file mode 100644
index 0000000..9eec870
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtendS.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtfastmath.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtfastmath.o
new file mode 100644
index 0000000..21883ef
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtfastmath.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec32.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec32.o
new file mode 100644
index 0000000..20ca2c8
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec32.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec64.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec64.o
new file mode 100644
index 0000000..fade145
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec64.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec80.o b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec80.o
new file mode 100644
index 0000000..34dc233
--- /dev/null
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/crtprec80.o
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/libgcc.a b/lib/gcc/x86_64-linux-android/4.9.x/x32/libgcc.a
similarity index 91%
rename from lib/gcc/x86_64-linux-android/4.9/x32/libgcc.a
rename to lib/gcc/x86_64-linux-android/4.9.x/x32/libgcc.a
index 8d11400..baa28e4 100644
--- a/lib/gcc/x86_64-linux-android/4.9/x32/libgcc.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/libgcc.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/libgcov.a b/lib/gcc/x86_64-linux-android/4.9.x/x32/libgcov.a
similarity index 72%
rename from lib/gcc/x86_64-linux-android/4.9/x32/libgcov.a
rename to lib/gcc/x86_64-linux-android/4.9.x/x32/libgcov.a
index 969d5eb..1717801 100644
--- a/lib/gcc/x86_64-linux-android/4.9/x32/libgcov.a
+++ b/lib/gcc/x86_64-linux-android/4.9.x/x32/libgcov.a
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9/32/crtbegin.o
deleted file mode 100644
index e69933b..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtbeginS.o b/lib/gcc/x86_64-linux-android/4.9/32/crtbeginS.o
deleted file mode 100644
index cbd796b..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtbeginS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9/32/crtbeginT.o
deleted file mode 100644
index e69933b..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtend.o b/lib/gcc/x86_64-linux-android/4.9/32/crtend.o
deleted file mode 100644
index 2b12daf..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtendS.o b/lib/gcc/x86_64-linux-android/4.9/32/crtendS.o
deleted file mode 100644
index 2b12daf..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtfastmath.o b/lib/gcc/x86_64-linux-android/4.9/32/crtfastmath.o
deleted file mode 100644
index a1dd86e..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtfastmath.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtprec32.o b/lib/gcc/x86_64-linux-android/4.9/32/crtprec32.o
deleted file mode 100644
index a824488..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtprec32.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtprec64.o b/lib/gcc/x86_64-linux-android/4.9/32/crtprec64.o
deleted file mode 100644
index 217fafb..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtprec64.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/32/crtprec80.o b/lib/gcc/x86_64-linux-android/4.9/32/crtprec80.o
deleted file mode 100644
index 70be6eb..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/32/crtprec80.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9/crtbegin.o
deleted file mode 100644
index 113d217..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9/crtbeginT.o
deleted file mode 100644
index 113d217..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/crtendS.o b/lib/gcc/x86_64-linux-android/4.9/crtendS.o
deleted file mode 100644
index 901ec57..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtbegin.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtbegin.o
deleted file mode 100644
index 91d6415..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtbeginT.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtbeginT.o
deleted file mode 100644
index 91d6415..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtend.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtend.o
deleted file mode 100644
index 16686c1..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtendS.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtendS.o
deleted file mode 100644
index 16686c1..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtfastmath.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtfastmath.o
deleted file mode 100644
index e7491f6..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtfastmath.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec32.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtprec32.o
deleted file mode 100644
index 4adb476..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec32.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec64.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtprec64.o
deleted file mode 100644
index ddd0272..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec64.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec80.o b/lib/gcc/x86_64-linux-android/4.9/x32/crtprec80.o
deleted file mode 100644
index 20985aa..0000000
--- a/lib/gcc/x86_64-linux-android/4.9/x32/crtprec80.o
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9.x/cc1 b/libexec/gcc/x86_64-linux-android/4.9.x/cc1
new file mode 100755
index 0000000..fa3c049
--- /dev/null
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/cc1
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9.x/cc1plus b/libexec/gcc/x86_64-linux-android/4.9.x/cc1plus
new file mode 100755
index 0000000..eb184d7
--- /dev/null
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/cc1plus
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/collect2 b/libexec/gcc/x86_64-linux-android/4.9.x/collect2
similarity index 99%
rename from libexec/gcc/x86_64-linux-android/4.9/collect2
rename to libexec/gcc/x86_64-linux-android/4.9.x/collect2
index 2446672..9d4d250 100755
--- a/libexec/gcc/x86_64-linux-android/4.9/collect2
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/collect2
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so b/libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so
rename to libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so
diff --git a/libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so.0 b/libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so.0
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so.0
rename to libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so.0
diff --git a/libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so.0.0.0 b/libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/libfunction_reordering_plugin.so.0.0.0
rename to libexec/gcc/x86_64-linux-android/4.9.x/libfunction_reordering_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so b/libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so
rename to libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so
diff --git a/libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so.0 b/libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so.0
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so.0
rename to libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so.0
diff --git a/libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so.0.0.0 b/libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so.0.0.0
similarity index 100%
rename from libexec/gcc/x86_64-linux-android/4.9/liblto_plugin.so.0.0.0
rename to libexec/gcc/x86_64-linux-android/4.9.x/liblto_plugin.so.0.0.0
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9.x/lto-wrapper b/libexec/gcc/x86_64-linux-android/4.9.x/lto-wrapper
new file mode 100755
index 0000000..78d4446
--- /dev/null
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9.x/lto1 b/libexec/gcc/x86_64-linux-android/4.9.x/lto1
new file mode 100755
index 0000000..29984f9
--- /dev/null
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/lto1
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/plugin/gengtype b/libexec/gcc/x86_64-linux-android/4.9.x/plugin/gengtype
similarity index 99%
rename from libexec/gcc/x86_64-linux-android/4.9/plugin/gengtype
rename to libexec/gcc/x86_64-linux-android/4.9.x/plugin/gengtype
index 4cdfb24..99cf1d0 100755
--- a/libexec/gcc/x86_64-linux-android/4.9/plugin/gengtype
+++ b/libexec/gcc/x86_64-linux-android/4.9.x/plugin/gengtype
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/cc1 b/libexec/gcc/x86_64-linux-android/4.9/cc1
deleted file mode 100755
index 4c0e9d8..0000000
--- a/libexec/gcc/x86_64-linux-android/4.9/cc1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/cc1plus b/libexec/gcc/x86_64-linux-android/4.9/cc1plus
deleted file mode 100755
index 1dd2b72..0000000
--- a/libexec/gcc/x86_64-linux-android/4.9/cc1plus
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/lto-wrapper b/libexec/gcc/x86_64-linux-android/4.9/lto-wrapper
deleted file mode 100755
index 7a0fc48..0000000
--- a/libexec/gcc/x86_64-linux-android/4.9/lto-wrapper
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/x86_64-linux-android/4.9/lto1 b/libexec/gcc/x86_64-linux-android/4.9/lto1
deleted file mode 100755
index dc294d3..0000000
--- a/libexec/gcc/x86_64-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
diff --git a/x86_64-linux-android/lib/libatomic.a b/x86_64-linux-android/lib/libatomic.a
index bd7f3b2..e976a2b 100644
--- a/x86_64-linux-android/lib/libatomic.a
+++ b/x86_64-linux-android/lib/libatomic.a
Binary files differ
diff --git a/x86_64-linux-android/lib/libgomp.a b/x86_64-linux-android/lib/libgomp.a
index ea72392..42c51d6 100644
--- a/x86_64-linux-android/lib/libgomp.a
+++ b/x86_64-linux-android/lib/libgomp.a
Binary files differ
diff --git a/x86_64-linux-android/lib/libquadmath.a b/x86_64-linux-android/lib/libquadmath.a
index 5baf8f9..502e68b 100644
--- a/x86_64-linux-android/lib/libquadmath.a
+++ b/x86_64-linux-android/lib/libquadmath.a
Binary files differ
diff --git a/x86_64-linux-android/lib64/libatomic.a b/x86_64-linux-android/lib64/libatomic.a
index d815eab..8272c3c 100644
--- a/x86_64-linux-android/lib64/libatomic.a
+++ b/x86_64-linux-android/lib64/libatomic.a
Binary files differ
diff --git a/x86_64-linux-android/lib64/libgomp.a b/x86_64-linux-android/lib64/libgomp.a
index 6b3fe8d..919f67f 100644
--- a/x86_64-linux-android/lib64/libgomp.a
+++ b/x86_64-linux-android/lib64/libgomp.a
Binary files differ
diff --git a/x86_64-linux-android/lib64/libquadmath.a b/x86_64-linux-android/lib64/libquadmath.a
index 0e70295..831ceb9 100644
--- a/x86_64-linux-android/lib64/libquadmath.a
+++ b/x86_64-linux-android/lib64/libquadmath.a
Binary files differ
diff --git a/x86_64-linux-android/libx32/libatomic.a b/x86_64-linux-android/libx32/libatomic.a
index 86785b3..9998dad 100644
--- a/x86_64-linux-android/libx32/libatomic.a
+++ b/x86_64-linux-android/libx32/libatomic.a
Binary files differ
diff --git a/x86_64-linux-android/libx32/libgomp.a b/x86_64-linux-android/libx32/libgomp.a
index 8970eb5..6f6f222 100644
--- a/x86_64-linux-android/libx32/libgomp.a
+++ b/x86_64-linux-android/libx32/libgomp.a
Binary files differ
diff --git a/x86_64-linux-android/libx32/libquadmath.a b/x86_64-linux-android/libx32/libquadmath.a
index 7af5422..1ee62f1 100644
--- a/x86_64-linux-android/libx32/libquadmath.a
+++ b/x86_64-linux-android/libx32/libquadmath.a
Binary files differ