Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."