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

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