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

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