Merge changes Ie52ddf30,Idfa637f6

* changes:
  logcat: Add --max-count option
  logcat: Add --regex option
tree: 779d358d45f6809eec803d4b1a32dc322354bf4e
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/