am 96957080: am 56b93693: am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"

* commit '969570804cdf7636bd405de9142c2d487e71384c':
  mkbootimg: support longer kernel command lines