Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I00a1c85dc0f9ff7ca71bd35a81be2c21333aa6f3
diff --git a/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a b/arm-linux-androideabi/lib/armv7-a/hard/libatomic.a
index 86695fb..2f9b527 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 24befec..43a7616 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 b73c34e..fefe796 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 9d21203..ebbe7bb 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 1d9e8f2..13926fc 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 730ffdb..49ff706 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 0d00206..2183a88 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 d3d91c3..e655e7e 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/ldscripts/armelf_linux_eabi.x b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.x
index da9dc99..e1cac00 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.x
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.x
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xbn b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xbn
index 4281a42..70b715d 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xbn
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xbn
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xc b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xc
index 395439a..a4f66db 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xc
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xd b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xd
index ba10653..f6e189e 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xd
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xd
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdc b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdc
index f0ada5b..2256898 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdc
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdw b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdw
index 5633fa8..2f56631 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdw
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xdw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xn b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xn
index e257e21..39510b6 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xn
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xn
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xs b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xs
index 4adc182..f6a54a4 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xs
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xs
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsc b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsc
index f7e551a..1abadd4 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsc
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsw b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsw
index ba8ffed..3a9f632 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsw
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xsw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xw b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xw
index 2849396..b786ccd 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xw
+++ b/arm-linux-androideabi/lib/ldscripts/armelf_linux_eabi.xw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.x b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.x
index 36b0182..9625e42 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.x
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.x
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xbn b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xbn
index d4f6c9b..e30fa50 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xbn
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xbn
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xc b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xc
index 27bf04b..2ccfcdf 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xc
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xd b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xd
index a889120..1939e19 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xd
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xd
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdc b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdc
index 14e424f..c744c53 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdc
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdw b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdw
index 1eaada3..5e79041 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdw
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xdw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xn b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xn
index 2c35f36..d9bc401 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xn
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xn
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xs b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xs
index cee1649..f67447c 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xs
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xs
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsc b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsc
index 80ee2f9..54f8dc6 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsc
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsc
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsw b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsw
index fa3c040..47e1865 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsw
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xsw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xw b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xw
index e851d7e..12db963 100644
--- a/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xw
+++ b/arm-linux-androideabi/lib/ldscripts/armelfb_linux_eabi.xw
@@ -7,7 +7,7 @@
 	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("=/tmp/00620c6f73a463974351027e5c858690/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
+SEARCH_DIR("=/tmp/b72757077e6ba599172458a1fbafb01b/arm-linux-androideabi/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/arm-linux-androideabi/lib/libatomic.a b/arm-linux-androideabi/lib/libatomic.a
index 60ffc32..39ca262 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 568b7f8..eeb25c6 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 afb7347..0f627b9 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 c7d5046..824bd5c 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 cedda87..1fab7f9 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 c9eb19e..f061442 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 b3f4f77..f1be99f 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 025a4e8..8235b9c 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 8e55ac8..18ae990 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 ba63323..e79d7c3 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 67d342f..fa6eacb 100755
--- a/bin/arm-linux-androideabi-elfedit
+++ b/bin/arm-linux-androideabi-elfedit
Binary files differ
diff --git a/bin/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x
index 0375246..6b8e257 100755
--- a/bin/arm-linux-androideabi-gcc-4.9.x
+++ 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 3b609b6..acec26f 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 508dbb4..194ec32 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 295c806..fcd2e92 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-gprof b/bin/arm-linux-androideabi-gprof
index d7b8f67..c9a937d 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 09aed32..dadcf4e 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 2b7de3f..dc803b1 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 251c918..d505cae 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 e64d172..4512c96 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 ffdf75d..8993870 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 6282948..914913a 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 22edcdc..dd8f24e 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 47c79d0..b1ce3a9 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 c98b9b2..dd24193 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 ee7b073..7208370 100755
--- a/bin/arm-linux-androideabi-strip
+++ b/bin/arm-linux-androideabi-strip
Binary files differ
diff --git a/bin/real-arm-linux-androideabi-g++ b/bin/real-arm-linux-androideabi-g++
index c2c11cc..f0c155b 100755
--- a/bin/real-arm-linux-androideabi-g++
+++ b/bin/real-arm-linux-androideabi-g++
Binary files differ
diff --git a/bin/real-arm-linux-androideabi-gcc b/bin/real-arm-linux-androideabi-gcc
index 0375246..6b8e257 100755
--- a/bin/real-arm-linux-androideabi-gcc
+++ b/bin/real-arm-linux-androideabi-gcc
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
index 7ebcaa5..896d52e 100644
--- 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
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/hard/libgcov.a
index 4c2e6c2..9a5f254 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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
index f8fff98..58f9fd3 100644
--- 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
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcov.a
index 7c03e7e..70dfdf6 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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.x/armv7-a/thumb/hard/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcc.a
index ccc365d..0ebfb40 100644
--- 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
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/hard/libgcov.a
index fc0c17f..64572b4 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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
index 9d7c28a..e40df5b 100644
--- 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
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/libgcov.a
index f36cad5..630f8df 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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.x/include-fixed/linux/a.out.h b/lib/gcc/arm-linux-androideabi/4.9.x/include-fixed/linux/a.out.h
index 445e4d9..c0f5609 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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/00620c6f73a463974351027e5c858690/sysroot/usr/include/linux/a.out.h"
+	"/tmp/b72757077e6ba599172458a1fbafb01b/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.x/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a
index f44c86f..c42481f 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/libgcc.a
Binary files differ
diff --git a/lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/libgcov.a
index 76dc366..0a76362 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/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.x/thumb/libgcc.a b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcc.a
index 8b72ec9..2f7f91f 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcc.a
+++ 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.x/thumb/libgcov.a b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
index 354b912..415dcf0 100644
--- a/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
+++ b/lib/gcc/arm-linux-androideabi/4.9.x/thumb/libgcov.a
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
index a8a1ef4..b29b8dc 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9.x/cc1
+++ 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
index 5cf323e..5dec476 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9.x/cc1plus
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/cc1plus
Binary files differ
diff --git a/libexec/gcc/arm-linux-androideabi/4.9.x/collect2 b/libexec/gcc/arm-linux-androideabi/4.9.x/collect2
index f3e03ea..a65845a 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9.x/collect2
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/collect2
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
index 2f06fc7..0f111b3 100755
--- a/libexec/gcc/arm-linux-androideabi/4.9.x/lto1
+++ b/libexec/gcc/arm-linux-androideabi/4.9.x/lto1
Binary files differ
diff --git a/repo.prop b/repo.prop
index c47df28..a12a59b 100644
--- a/repo.prop
+++ b/repo.prop
@@ -1,15 +1,15 @@
 platform/manifest 32457fab0d5f1d8b960e9a9ebe3ac0b99205d24e
-platform/ndk a522f6f54dab9b89f0a7f055ed300df024df1c47
+platform/ndk fbc7178ba73fb8c39cff4de6b3a4d1679603381a
 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.15-4.8 2ccb38af8c940f1feef62ff5986f4bbc5d899e66
-platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8 e76a9a506d7ad132f107eb2f7c27b6a8ccb68b91
-platform/prebuilts/ndk 342e1e9469e465daa4b9278c9655129462195f7f
-toolchain/binutils 41d8fcbbadfde8f3de3bf4b2e3d3f2736033cc22
+platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8 24285de70c617d2bd051e070598d8d4e2efb221a
+platform/prebuilts/ndk b238c93dbbe9ea3cfa7d9acc354e6a4d5da4ffa2
+toolchain/binutils 44492f8e438f8ce42a254699ba8496eb76075e00
 toolchain/build 58be6006bb71abb97d7cdff7be3e73d55bbc22b8
 toolchain/cloog 604793eab97d360aef729f064674569ee6dbf3e1
 toolchain/expat 40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5
-toolchain/gcc e46354e85363dbd7ea85492f70af89273881709f
+toolchain/gcc a74813a825e49267faa0b2ba45e9cd4bd6ccf4f4
 toolchain/gmp b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810
 toolchain/isl 0ccf95726af8ce58ad61ff474addbce3a31ba99c
 toolchain/mpc 835d16e92eed875638a8b5d552034c3b1aae045b