Merge "logcat: Add -h and --help flags"