Merge "mkbootimg: parse hexadecimal ints"