GCC 4.9: move binary names and add 3s sleeps am: 79c7e3e6ed am: 342f6bb040
am: e53648fe1b

Change-Id: I2474fcc2458952ca3092b10c1c31576929376494