Merge "dumpstate: calculate logcat timeout using readable buffer size"