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

Change-Id: I431aa6a6b1eef7142200039e94deabb6746c0dcb