Merge "Add lshal --neat option" am: 3a6828d50b am: 702ca32b5a am: 42648b7216
am: 52b7b5edc4

Change-Id: Icc2a7f152310f59a36f1c24e1e955a112d61ec8c