Merge "logcat: fix print of logcat -g" am: 850cbda465
am: 1f397d4e14

Change-Id: I7f6157b873d00cd138eac522152c85237817b92d