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

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