am 358641ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '358641ec1af9aa2b4f87e688f04e4836eccf2f20':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.