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

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