Merge changes Ie52ddf30,Idfa637f6

* changes:
  logcat: Add --max-count option
  logcat: Add --regex option