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

* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
  MKBOOTIMG override were missing in two places