am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."

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