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

Change-Id: I2fc3254c686b8ba84db0eef8f97514fc3af851ab