Merge changes I0c3887f2,I8fc585bb into oc-dev
am: e98f1a9c56

Change-Id: If640c9ff05a681cd09d01fd1e617026e7b24719e
tree: 261db2b184b3a62922e0c4564726149c01571d53
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/