am edb76333: am e6950362: am 8ec42bb2: Merge "mkbootimg: fix padding calculation for 2ndstage loader"

* commit 'edb763331128101871f4a5b29fee3d60ee5a4bee':
  mkbootimg: fix padding calculation for 2ndstage loader