Merge "dumpstate: more time for non-zipping lshal debug"