am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"

* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
  mkbootimg: Support custom mkbootimg implementation