Merge "lshal: strip ending \0 from cmdline"
am: 469e9925b4

Change-Id: I206969d4ae0b7b3720d1b918c3adbff1b2bcd79d