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

Change-Id: I6751fec855783983b96672bec82ae9ba0c737a8b