GCC 4.9: move binary names and add 3s sleeps am: ce58c99e1b
am: 8076426b15

Change-Id: I9016d7cc79be0157707748b1d83b2c66e69a54c5