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

Change-Id: Ifa29afcb7677a3ec76a03d5f0365ba4de7ee4c9b