Merge changes Ie52ddf30,Idfa637f6 am: 5c8b99d
am: 21caa75

* commit '21caa750b65ce64a0ce7cefce9cf7bb523b5b9fa':
  logcat: Add --max-count option
  logcat: Add --regex option