Merge "Fix fastboot to cope with hammerhead\'s implicit hex." am: 2b7b3bd100 am: 4ca547be67
am: 0406de14d0

* commit '0406de14d023918f4cdb3c928b6c2f3f67abf9e5':
  Fix fastboot to cope with hammerhead's implicit hex.