Merge "logcat: improve --help and error messages"
am: bb4754bef9

Change-Id: Ib698c74bc9e7cc3b16ead20635b6a714916040eb