Merge \"Revert \"logcat: expand -n, -r and -b\"\"
am: 8c60f2dcfe

Change-Id: I585419935dd0322202bb8459b35491b437cfebd5