Merge "Add lshal --neat option"
am: 3a6828d50b

Change-Id: I15e00e281522c2ff59f885636c49d3ac41fc8eee