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