Merge "mkbootimg: fix padding calculation for 2ndstage loader"