Merge "liblogcat: introduce getopt_long_r"
am: 58381648b1

Change-Id: I3a3994f8f5d5f52b47239bd9aebb849a14eb3c8c