Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"