Merge "Fix fastboot to cope with hammerhead's implicit hex."