Merge "Revert "logcat: expand -n, -r and -b""