Merge changes from topic 'logcatd -L' into oc-dev
am: c155fbedf2

Change-Id: I9e80ce2bd3b8b601f6ac5e4b1312a1e6a9bf9d10