Merge "dumpstate: modify logcat timeout to compensate for storage speed"