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

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