Merge "Now that toybox is chmod -w, mv needs -f to overwrite it."