Update prebuilt GCC to build 2734602 (retry)

Change-Id: Ie769ec6c033a1836a0e5416f27dbafa901496d13
diff --git a/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a b/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a
index 4d894fe..647dc68 100644
--- a/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a
+++ b/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/hard/libgomp.a b/arm-linux-androideabi/lib/armv7-a/hard/libgomp.a
index 04ab701..234bc44 100644
--- a/arm-linux-androideabi/lib/armv7-a/hard/libgomp.a
+++ b/arm-linux-androideabi/lib/armv7-a/hard/libgomp.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/libatomic.a b/arm-linux-androideabi/lib/armv7-a/libatomic.a
index 7b02608..3e34929 100644
--- a/arm-linux-androideabi/lib/armv7-a/libatomic.a
+++ b/arm-linux-androideabi/lib/armv7-a/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/libgomp.a b/arm-linux-androideabi/lib/armv7-a/libgomp.a
index 78c296b..e1ca37b 100644
--- a/arm-linux-androideabi/lib/armv7-a/libgomp.a
+++ b/arm-linux-androideabi/lib/armv7-a/libgomp.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/thumb/hard/libatomic.a b/arm-linux-androideabi/lib/armv7-a/thumb/hard/libatomic.a
index 2a97e35..70b0cae 100644
--- a/arm-linux-androideabi/lib/armv7-a/thumb/hard/libatomic.a
+++ b/arm-linux-androideabi/lib/armv7-a/thumb/hard/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/thumb/hard/libgomp.a b/arm-linux-androideabi/lib/armv7-a/thumb/hard/libgomp.a
index 786eeb5..b69e38a 100644
--- a/arm-linux-androideabi/lib/armv7-a/thumb/hard/libgomp.a
+++ b/arm-linux-androideabi/lib/armv7-a/thumb/hard/libgomp.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/thumb/libatomic.a b/arm-linux-androideabi/lib/armv7-a/thumb/libatomic.a
index 1bb9c8e..c1fb203 100644
--- a/arm-linux-androideabi/lib/armv7-a/thumb/libatomic.a
+++ b/arm-linux-androideabi/lib/armv7-a/thumb/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/armv7-a/thumb/libgomp.a b/arm-linux-androideabi/lib/armv7-a/thumb/libgomp.a
index 579938a..b2d3ae9 100644
--- a/arm-linux-androideabi/lib/armv7-a/thumb/libgomp.a
+++ b/arm-linux-androideabi/lib/armv7-a/thumb/libgomp.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/libatomic.a b/arm-linux-androideabi/lib/libatomic.a
index 831bfc4..4e93375 100644
--- a/arm-linux-androideabi/lib/libatomic.a
+++ b/arm-linux-androideabi/lib/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/libgomp.a b/arm-linux-androideabi/lib/libgomp.a
index 66c3cf7..4aebf6e 100644
--- a/arm-linux-androideabi/lib/libgomp.a
+++ b/arm-linux-androideabi/lib/libgomp.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/thumb/libatomic.a b/arm-linux-androideabi/lib/thumb/libatomic.a
index d4c84e2..2d8dedc 100644
--- a/arm-linux-androideabi/lib/thumb/libatomic.a
+++ b/arm-linux-androideabi/lib/thumb/libatomic.a
Binary files differ
diff --git a/arm-linux-androideabi/lib/thumb/libgomp.a b/arm-linux-androideabi/lib/thumb/libgomp.a
index c020c27..9b9c4fc 100644
--- a/arm-linux-androideabi/lib/thumb/libgomp.a
+++ b/arm-linux-androideabi/lib/thumb/libgomp.a
Binary files differ
diff --git a/bin/arm-linux-androideabi-addr2line b/bin/arm-linux-androideabi-addr2line
index ac8231c..29405f4 100755
--- a/bin/arm-linux-androideabi-addr2line
+++ b/bin/arm-linux-androideabi-addr2line
Binary files differ
diff --git a/bin/arm-linux-androideabi-ar b/bin/arm-linux-androideabi-ar
index 6529c78..375d025 100755
--- a/bin/arm-linux-androideabi-ar
+++ b/bin/arm-linux-androideabi-ar
Binary files differ
diff --git a/bin/arm-linux-androideabi-as b/bin/arm-linux-androideabi-as
index f40a46b..9311f01 100755
--- a/bin/arm-linux-androideabi-as
+++ b/bin/arm-linux-androideabi-as
Binary files differ
diff --git a/bin/arm-linux-androideabi-c++filt b/bin/arm-linux-androideabi-c++filt
index 23dda66..3a158e0 100755
--- a/bin/arm-linux-androideabi-c++filt
+++ b/bin/arm-linux-androideabi-c++filt
Binary files differ
diff --git a/bin/arm-linux-androideabi-cpp b/bin/arm-linux-androideabi-cpp
index f5f97e6..5d4f48b 100755
--- a/bin/arm-linux-androideabi-cpp
+++ b/bin/arm-linux-androideabi-cpp
Binary files differ
diff --git a/bin/arm-linux-androideabi-dwp b/bin/arm-linux-androideabi-dwp
index 3e51cef..3f73622 100755
--- a/bin/arm-linux-androideabi-dwp
+++ b/bin/arm-linux-androideabi-dwp
Binary files differ
diff --git a/bin/arm-linux-androideabi-elfedit b/bin/arm-linux-androideabi-elfedit
index d0646c1..5f0bb09 100755
--- a/bin/arm-linux-androideabi-elfedit
+++ b/bin/arm-linux-androideabi-elfedit
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++
index a317439..2ae76fb 100755
--- a/bin/arm-linux-androideabi-g++
+++ b/bin/arm-linux-androideabi-g++
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc
index 7e33c9e..ada4adf 100755
--- a/bin/arm-linux-androideabi-gcc
+++ b/bin/arm-linux-androideabi-gcc
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x
new file mode 100755
index 0000000..ada4adf
--- /dev/null
+++ b/bin/arm-linux-androideabi-gcc-4.9.x
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-ar b/bin/arm-linux-androideabi-gcc-ar
index c019079..18d7318 100755
--- a/bin/arm-linux-androideabi-gcc-ar
+++ b/bin/arm-linux-androideabi-gcc-ar
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-nm b/bin/arm-linux-androideabi-gcc-nm
index 37416bd..1e61f55 100755
--- a/bin/arm-linux-androideabi-gcc-nm
+++ b/bin/arm-linux-androideabi-gcc-nm
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-ranlib b/bin/arm-linux-androideabi-gcc-ranlib
index c06146a..ecb7be1 100755
--- a/bin/arm-linux-androideabi-gcc-ranlib
+++ b/bin/arm-linux-androideabi-gcc-ranlib
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcov b/bin/arm-linux-androideabi-gcov
index 6ce68b9..bccf53b 100755
--- a/bin/arm-linux-androideabi-gcov
+++ b/bin/arm-linux-androideabi-gcov
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcov-tool b/bin/arm-linux-androideabi-gcov-tool
index c4b7e22..79ec33c 100755
--- a/bin/arm-linux-androideabi-gcov-tool
+++ b/bin/arm-linux-androideabi-gcov-tool
Binary files differ
diff --git a/bin/arm-linux-androideabi-gprof b/bin/arm-linux-androideabi-gprof
index fc50812..b8e7a2b 100755
--- a/bin/arm-linux-androideabi-gprof
+++ b/bin/arm-linux-androideabi-gprof
Binary files differ
diff --git a/bin/arm-linux-androideabi-ld.bfd b/bin/arm-linux-androideabi-ld.bfd
index a11a045..122864d 100755
--- a/bin/arm-linux-androideabi-ld.bfd
+++ b/bin/arm-linux-androideabi-ld.bfd
Binary files differ
diff --git a/bin/arm-linux-androideabi-ld.gold b/bin/arm-linux-androideabi-ld.gold
index 9834917..4f69a5a 100755
--- a/bin/arm-linux-androideabi-ld.gold
+++ b/bin/arm-linux-androideabi-ld.gold
Binary files differ
diff --git a/bin/arm-linux-androideabi-nm b/bin/arm-linux-androideabi-nm
index e96f83a..a61ac52 100755
--- a/bin/arm-linux-androideabi-nm
+++ b/bin/arm-linux-androideabi-nm
Binary files differ
diff --git a/bin/arm-linux-androideabi-objcopy b/bin/arm-linux-androideabi-objcopy
index 52d73fd..6242627 100755
--- a/bin/arm-linux-androideabi-objcopy
+++ b/bin/arm-linux-androideabi-objcopy
Binary files differ
diff --git a/bin/arm-linux-androideabi-objdump b/bin/arm-linux-androideabi-objdump
index f0c31af..7609fe1 100755
--- a/bin/arm-linux-androideabi-objdump
+++ b/bin/arm-linux-androideabi-objdump
Binary files differ
diff --git a/bin/arm-linux-androideabi-ranlib b/bin/arm-linux-androideabi-ranlib
index 35cc5ba..bf66286 100755
--- a/bin/arm-linux-androideabi-ranlib
+++ b/bin/arm-linux-androideabi-ranlib
Binary files differ
diff --git a/bin/arm-linux-androideabi-readelf b/bin/arm-linux-androideabi-readelf
index 63016a3..2b4a8f1 100755
--- a/bin/arm-linux-androideabi-readelf
+++ b/bin/arm-linux-androideabi-readelf
Binary files differ
diff --git a/bin/arm-linux-androideabi-size b/bin/arm-linux-androideabi-size
index 81949e3..460bbc9 100755
--- a/bin/arm-linux-androideabi-size
+++ b/bin/arm-linux-androideabi-size
Binary files differ
diff --git a/bin/arm-linux-androideabi-strings b/bin/arm-linux-androideabi-strings
index 8303945..69046a8 100755
--- a/bin/arm-linux-androideabi-strings
+++ b/bin/arm-linux-androideabi-strings
Binary files differ
diff --git a/bin/arm-linux-androideabi-strip b/bin/arm-linux-androideabi-strip
index ac0b09e..228b0ab 100755
--- a/bin/arm-linux-androideabi-strip
+++ b/bin/arm-linux-androideabi-strip
Binary files differ
diff --git a/bin/arm-linux-androidkernel-strip b/bin/arm-linux-androidkernel-strip
new file mode 120000
index 0000000..f527009
--- /dev/null
+++ b/bin/arm-linux-androidkernel-strip
@@ -0,0 +1 @@
+arm-linux-androideabi-strip
\ No newline at end of file
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbegin.o
similarity index 65%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbegin.o
index 26e5081..3f77817 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginS.o
similarity index 70%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginS.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginS.o
index dc023b9..5b741c3 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginS.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginT.o
similarity index 65%
copy from lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o
copy to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginT.o
index 26e5081..3f77817 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtend.o
new file mode 100644
index 0000000..c178c92
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtendS.o
new file mode 100644
index 0000000..c178c92
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbegin.o
new file mode 100644
index 0000000..0a1c9d5
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginS.o
new file mode 100644
index 0000000..59cf08e
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginT.o
new file mode 100644
index 0000000..0a1c9d5
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtend.o
new file mode 100644
index 0000000..592ec50
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtendS.o
new file mode 100644
index 0000000..592ec50
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcc.a
new file mode 100644
index 0000000..add100c
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcov.a
similarity index 74%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcov.a
index 9344e18..68f2c94 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcc.a
new file mode 100644
index 0000000..9e331a2
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcov.a
similarity index 69%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcov.a
index 46e5a57..ed8498a 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbegin.o
similarity index 65%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbegin.o
index e8f675e..e8ee43e 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginS.o
similarity index 70%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginS.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginS.o
index 41c2ec2..84df6aa 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginS.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginT.o
similarity index 65%
copy from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o
copy to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginT.o
index e8f675e..e8ee43e 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtend.o
new file mode 100644
index 0000000..e527a7b
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtendS.o
new file mode 100644
index 0000000..e527a7b
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbegin.o
new file mode 100644
index 0000000..cf7d5a2
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginS.o
similarity index 60%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginS.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginS.o
index 8a3619d..63c1d37 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginS.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginT.o
new file mode 100644
index 0000000..cf7d5a2
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtend.o
new file mode 100644
index 0000000..a979e13
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtendS.o
new file mode 100644
index 0000000..a979e13
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcc.a
new file mode 100644
index 0000000..6901826
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcov.a
similarity index 71%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcov.a
index 5dabeb2..89c683c 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcc.a
new file mode 100644
index 0000000..8c2a58d
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcov.a
similarity index 69%
rename from lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcov.a
index 1578018..007d982 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o
similarity index 75%
rename from lib/gcc/arm-linux-androideabi/4.9/crtbegin.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o
index 4cd81b4..02142a4 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/crtbeginS.o
similarity index 76%
rename from lib/gcc/arm-linux-androideabi/4.9/crtbeginS.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/crtbeginS.o
index f9338fb..399e1f2 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/crtbeginS.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9.x/crtbeginT.o
similarity index 75%
rename from lib/gcc/arm-linux-androideabi/4.9/crtbeginT.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/crtbeginT.o
index 4cd81b4..02142a4 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/crtbeginT.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/crtend.o
new file mode 100644
index 0000000..beb83c4
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/crtendS.o
new file mode 100644
index 0000000..beb83c4
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-counter.def b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-counter.def
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-counter.def
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-counter.def
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-io.c b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-io.c
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-io.c
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-io.c
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-io.h b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-io.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-io.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-io.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-iov.h b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-iov.h
similarity index 72%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-iov.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/gcov-iov.h
index d6e33b7..0da8e1d 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/gcov-iov.h
+++ b/lib/gcc/arm-linux-androideabi/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/arm-linux-androideabi/4.9/gcov-src/libgcov-driver-kernel.c b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-driver-kernel.c
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-driver-kernel.c
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-driver-kernel.c
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-driver.c b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-driver.c
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-driver.c
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-driver.c
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-kernel.h b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-kernel.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-kernel.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-kernel.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-merge.c b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-merge.c
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-merge.c
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-merge.c
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-profiler.c b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-profiler.c
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov-profiler.c
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov-profiler.c
diff --git a/lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov.h b/lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/gcov-src/libgcov.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/gcov-src/libgcov.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include-fixed/README b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/README
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include-fixed/README
rename to lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/README
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include-fixed/limits.h b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/limits.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include-fixed/limits.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/limits.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include-fixed/linux/a.out.h b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/linux/a.out.h
similarity index 98%
rename from lib/gcc/arm-linux-androideabi/4.9/include-fixed/linux/a.out.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/linux/a.out.h
index 69b4a03..727de6a 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/include-fixed/linux/a.out.h
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/linux/a.out.h
@@ -2,7 +2,7 @@
 
     It has been auto-edited by fixincludes from:
 
-	"/tmp/7164d5491ae6bf4b416ecca8e9e2e3f3/sysroot/usr/include/linux/a.out.h"
+	"/tmp/0899942388fbb00fc6ca4802fb5910ae/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/arm-linux-androideabi/4.9/include-fixed/syslimits.h b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/syslimits.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include-fixed/syslimits.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/syslimits.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/arm_acle.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/arm_acle.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/arm_acle.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/arm_acle.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/arm_neon.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/arm_neon.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/arm_neon.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/arm_neon.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/float.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/float.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/float.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/float.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/iso646.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/iso646.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/iso646.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/iso646.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/mmintrin.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/mmintrin.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/mmintrin.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/mmintrin.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/omp.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/omp.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/omp.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/omp.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdalign.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdalign.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdalign.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdalign.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdarg.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdarg.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdarg.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdarg.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdatomic.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdatomic.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdatomic.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdatomic.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdbool.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdbool.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdbool.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdbool.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stddef.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stddef.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stddef.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stddef.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdfix.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdfix.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdfix.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdfix.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdint-gcc.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdint-gcc.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdint-gcc.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdint-gcc.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdint.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdint.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdint.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdint.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/stdnoreturn.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/stdnoreturn.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/stdnoreturn.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/stdnoreturn.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/unwind-arm-common.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/unwind-arm-common.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/unwind-arm-common.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/unwind-arm-common.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/unwind.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/unwind.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/unwind.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/unwind.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9/include/varargs.h b/lib/gcc/arm-linux-androideabi/4.9.x/include/varargs.h
similarity index 100%
rename from lib/gcc/arm-linux-androideabi/4.9/include/varargs.h
rename to lib/gcc/arm-linux-androideabi/4.9.x/include/varargs.h
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a
new file mode 100644
index 0000000..3865c03
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a
similarity index 66%
rename from lib/gcc/arm-linux-androideabi/4.9/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a
index acbf4ba..56c7465 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbegin.o
similarity index 76%
rename from lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbegin.o
index 1366864..24133b2 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbegin.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginS.o
similarity index 76%
rename from lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginS.o
rename to lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginS.o
index 132c477..1dc4b7a 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginS.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginT.o
similarity index 76%
copy from lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o
copy to lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginT.o
index 1366864..24133b2 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbegin.o
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtbeginT.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtend.o b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtend.o
new file mode 100644
index 0000000..ba3efc1
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtend.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtendS.o
new file mode 100644
index 0000000..ba3efc1
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/crtendS.o
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcc.a
new file mode 100644
index 0000000..c9185c8
--- /dev/null
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
similarity index 66%
rename from lib/gcc/arm-linux-androideabi/4.9/thumb/libgcov.a
rename to lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
index 8903727..e709292 100644
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginT.o
deleted file mode 100644
index 26e5081..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtend.o
deleted file mode 100644
index bb471b8..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtendS.o
deleted file mode 100644
index bb471b8..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbegin.o
deleted file mode 100644
index 4d56497..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginS.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginS.o
deleted file mode 100644
index 9d6c824..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginT.o
deleted file mode 100644
index 4d56497..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtend.o
deleted file mode 100644
index ee3fb52..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtendS.o
deleted file mode 100644
index ee3fb52..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcc.a
deleted file mode 100644
index 8c9d8df..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/hard/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcc.a
deleted file mode 100644
index f5b41fd..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginT.o
deleted file mode 100644
index e8f675e..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtend.o
deleted file mode 100644
index a0001d5..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtendS.o
deleted file mode 100644
index a0001d5..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbegin.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbegin.o
deleted file mode 100644
index 38f8f3a..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbegin.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginT.o
deleted file mode 100644
index 38f8f3a..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtend.o
deleted file mode 100644
index cd35342..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtendS.o
deleted file mode 100644
index cd35342..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcc.a
deleted file mode 100644
index a879668..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/hard/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcc.a
deleted file mode 100644
index 5b9700c..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/armv7-a/thumb/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/crtend.o
deleted file mode 100644
index fd840f0..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/crtendS.o
deleted file mode 100644
index fd840f0..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
deleted file mode 100644
index 910f60d..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginT.o b/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginT.o
deleted file mode 100644
index 1366864..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtbeginT.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtend.o b/lib/gcc/arm-linux-androideabi/4.9/thumb/crtend.o
deleted file mode 100644
index 386edb9..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtend.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtendS.o b/lib/gcc/arm-linux-androideabi/4.9/thumb/crtendS.o
deleted file mode 100644
index 386edb9..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/crtendS.o
+++ /dev/null
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9/thumb/libgcc.a
deleted file mode 100644
index 85587a5..0000000
--- a/lib/gcc/arm-linux-androideabi/4.9/thumb/libgcc.a
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9.x/cc1 b/libexec/gcc/arm-linux-androideabi/4.9.x/cc1
new file mode 100755
index 0000000..81a2944
--- /dev/null
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/cc1
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9.x/cc1plus b/libexec/gcc/arm-linux-androideabi/4.9.x/cc1plus
new file mode 100755
index 0000000..103b92b
--- /dev/null
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/cc1plus
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/collect2 b/libexec/gcc/arm-linux-androideabi/4.9.x/collect2
similarity index 93%
rename from libexec/gcc/arm-linux-androideabi/4.9/collect2
rename to libexec/gcc/arm-linux-androideabi/4.9.x/collect2
index bf7ee20..81eddac 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9/collect2
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/collect2
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/libfunction_reordering_plugin.0.so b/libexec/gcc/arm-linux-androideabi/4.9.x/libfunction_reordering_plugin.0.so
similarity index 100%
rename from libexec/gcc/arm-linux-androideabi/4.9/libfunction_reordering_plugin.0.so
rename to libexec/gcc/arm-linux-androideabi/4.9.x/libfunction_reordering_plugin.0.so
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/libfunction_reordering_plugin.so b/libexec/gcc/arm-linux-androideabi/4.9.x/libfunction_reordering_plugin.so
similarity index 100%
rename from libexec/gcc/arm-linux-androideabi/4.9/libfunction_reordering_plugin.so
rename to libexec/gcc/arm-linux-androideabi/4.9.x/libfunction_reordering_plugin.so
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.0.so b/libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin.0.so
similarity index 100%
rename from libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.0.so
rename to libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin.0.so
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.so b/libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin.so
similarity index 100%
rename from libexec/gcc/arm-linux-androideabi/4.9/liblto_plugin.so
rename to libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin.so
diff --git a/libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper b/libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper
new file mode 100755
index 0000000..8796fa3
--- /dev/null
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9.x/lto1 b/libexec/gcc/arm-linux-androideabi/4.9.x/lto1
new file mode 100755
index 0000000..ef5d4c2
--- /dev/null
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/lto1
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/plugin/gengtype b/libexec/gcc/arm-linux-androideabi/4.9.x/plugin/gengtype
similarity index 99%
rename from libexec/gcc/arm-linux-androideabi/4.9/plugin/gengtype
rename to libexec/gcc/arm-linux-androideabi/4.9.x/plugin/gengtype
index 77f6aaa..1282c04 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9/plugin/gengtype
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/plugin/gengtype
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/cc1 b/libexec/gcc/arm-linux-androideabi/4.9/cc1
deleted file mode 100755
index a50080a..0000000
--- a/libexec/gcc/arm-linux-androideabi/4.9/cc1
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/cc1plus b/libexec/gcc/arm-linux-androideabi/4.9/cc1plus
deleted file mode 100755
index 46f5d47..0000000
--- a/libexec/gcc/arm-linux-androideabi/4.9/cc1plus
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/lto-wrapper b/libexec/gcc/arm-linux-androideabi/4.9/lto-wrapper
deleted file mode 100755
index e11fd9e..0000000
--- a/libexec/gcc/arm-linux-androideabi/4.9/lto-wrapper
+++ /dev/null
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9/lto1 b/libexec/gcc/arm-linux-androideabi/4.9/lto1
deleted file mode 100755
index 7160238..0000000
--- a/libexec/gcc/arm-linux-androideabi/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