Merge "lshal: strip ending \0 from cmdline" am: 469e9925b4 am: 7d905e37cf
am: 6a3ca94b9f

Change-Id: Ic78fc1bcd3980ae409471a14c5f44c01bd88a730