am 55c2e1f4: Merge "Clean up init /proc/cmdline handling."

* commit '55c2e1f4ba3aa3285da32c6a6027c11d9f7c22ed':
  Clean up init /proc/cmdline handling.