Merge "Dumpstate: Fix long lines." into stage-aosp-master