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

Change-Id: I1f53c731e5280d28035b382f3946f03136249458