Merge "liblogcat: introduce getopt_long_r"