Merge "dumpstate: specify default args for lshal" into stage-aosp-master