Merge "Enable --debug option for "lshal" command." am: 16175ca725
am: 674d3acd18

Change-Id: If87550eb68a9c8e280d8863063b4311a44ff6896