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

Change-Id: I49f3e2bea140a4fa1949bc199aa15e1e331ffb11