Merge "mkbootimg: support longer kernel command lines"