GCC 4.9: move binary names and add 1s sleeps am: fa9fc8d987
am: 2b009604ba

Change-Id: I0dadf68a6303c814f5c0815fb60c855a4a63f671