GCC 4.9: move binary names and add 1s sleeps am: 8f7a539963
am: abf20060fb

Change-Id: Ic9f1b07863b705c062d83c81684e5af806cece1a