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

* commit '4ca547be67ed1b65c5ced5eeafdb6fe8fe3c3011':
  Fix fastboot to cope with hammerhead's implicit hex.