Snap for 5822255 from 3396aa6a4fc586fd3e71e426f4ae7c351efeadc9 to r-keystone-qcom-release

Change-Id: I1b91fea1243cd0ceeb05dd746c66e12d7783f744
diff --git a/bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53 b/bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd
similarity index 100%
rename from bin/7fefe5b2-2588-11e9-996b-2bbad94f2d53
rename to bin/11e1bff0-6232-11e9-a0b8-ab0e95bc2acd
Binary files differ
diff --git a/bin/8345f5e4-2588-11e9-ba23-c7b0d410816e b/bin/2cddb322-6232-11e9-93da-4755b1c03667
similarity index 100%
rename from bin/8345f5e4-2588-11e9-ba23-c7b0d410816e
rename to bin/2cddb322-6232-11e9-93da-4755b1c03667
Binary files differ
diff --git a/bin/arm-linux-androideabi-g++ b/bin/arm-linux-androideabi-g++
index 5923d19..cbe488e 100755
--- a/bin/arm-linux-androideabi-g++
+++ b/bin/arm-linux-androideabi-g++
@@ -3,6 +3,7 @@
 from __future__ import print_function
 import os
 import sys
+import time
 
 class CompilerWrapper():
   def __init__(self, argv):
@@ -25,7 +26,7 @@
       compiler = os.path.basename(os.path.abspath(__file__))
     self.real_compiler = os.path.join(
         compiler_path,
-        "8345f5e4-2588-11e9-ba23-c7b0d410816e")
+        "2cddb322-6232-11e9-93da-4755b1c03667")
     self.argv0 = self.real_compiler
 
   def process_gomacc_command(self):
@@ -64,6 +65,7 @@
     self.process_gomacc_command()
     self.add_flags()
     self.execargs += [self.real_compiler] + self.args
+    time.sleep(1)
     os.execv(self.argv0, self.execargs)
 
 
diff --git a/bin/arm-linux-androideabi-gcc b/bin/arm-linux-androideabi-gcc
index e937a80..cb1efbb 100755
--- a/bin/arm-linux-androideabi-gcc
+++ b/bin/arm-linux-androideabi-gcc
@@ -3,6 +3,7 @@
 from __future__ import print_function
 import os
 import sys
+import time
 
 class CompilerWrapper():
   def __init__(self, argv):
@@ -25,7 +26,7 @@
       compiler = os.path.basename(os.path.abspath(__file__))
     self.real_compiler = os.path.join(
         compiler_path,
-        "7fefe5b2-2588-11e9-996b-2bbad94f2d53")
+        "11e1bff0-6232-11e9-a0b8-ab0e95bc2acd")
     self.argv0 = self.real_compiler
 
   def process_gomacc_command(self):
@@ -64,6 +65,7 @@
     self.process_gomacc_command()
     self.add_flags()
     self.execargs += [self.real_compiler] + self.args
+    time.sleep(1)
     os.execv(self.argv0, self.execargs)
 
 
diff --git a/bin/arm-linux-androideabi-gcc-4.9.x b/bin/arm-linux-androideabi-gcc-4.9.x
deleted file mode 100755
index af3717d..0000000
--- a/bin/arm-linux-androideabi-gcc-4.9.x
+++ /dev/null
Binary files differ