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

Change-Id: Iff6242509e5cb9de47469984b1ab6361346c09e4