Merge "mkbootimg: print addresses and offsets in hex" am: b778c44c07
am: 06e721c3e2

Change-Id: Ide9e86f4298e10c6885f4c0dc17ea83c7e10e882