use mv instead of rsync to prevent rebuild failure

Change-Id: I636ce4bb9155fe9cfc24803192abd54792528690
fix countdown if you hit esc to cancel Fuel Setup

Change-Id: Ie2a3d42301b79f8b48706259e046626e49c576a7
Merge "fix countdown if you hit esc to cancel Fuel Setup"
Merge "use mv instead of rsync to prevent rebuild failure"