am cba158a6: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." into jb-mr1-dev

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