Merge "lshal: add help message for --neat" am: 87ffcc425e am: 17f20b035b
am: 4a9b6d9546

Change-Id: Ib47587f5707fba6922c13f747a181d6027b4ea6c