Merge "logcat: Add -h and --help flags" am: 23e308398f am: d3d3dddd31 am: 83f8d0b5c2
am: a1c10c01da

Change-Id: I9e2f1f225a0c096596564cc3023e11de30932c3f