Merge changes Ie52ddf30,Idfa637f6
am: 5c8b99d

* commit '5c8b99da1a58c5776166c3b4972e902b943fe057':
  logcat: Add --max-count option
  logcat: Add --regex option