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

Change-Id: I3fe4e2d27f248bd6e5ed531c2f7602dfcb912460