Merge "liblogcat: introduce getopt_long_r" am: 58381648b1
am: 68741efbe3

Change-Id: I12097e6e01528c7ba9b6f95355fd7ff648accfe8