GCC 4.9: move binary names and add 3s sleeps am: bdf4e21fbd
am: d596823559

Change-Id: I6fb98b10f07f59dbf091d76da036d68b9524b4fc