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

* commit '1b23b33d92f32626584153739308e9147d1541bd':
  MKBOOTIMG override were missing in two places