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

Change-Id: I36e97f7ed9c0a5ee81c8608320574cd44399b4c7