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

Change-Id: Ic369e7901ff5be09526f575afe7f2d42e2ceff00