am 74a38f1a: am b6e1632f: am 8773d62c: Merge "mkbootimg: parse hexadecimal ints"

* commit '74a38f1adb2a6341c7d12cda06175055cb917527':
  mkbootimg: parse hexadecimal ints