Merge "dumpstate: specify default args for lshal" into stage-aosp-master am: d81eb0f2f2
am: 70fbf026f2

Change-Id: I6a61cfdfd87f5fe838e5be08d6729fa6059af41f