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

Change-Id: I193384c9dc22b4585dfd4f7f08278138eb5578cc