am 8853f518: am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places"

* commit '8853f5181b1ae1682d9433c28e120f25f63a4721':
  MKBOOTIMG override were missing in two places