Merge changes Iaddc4e1b,I57d84af2
am: fa05eaa968

Change-Id: Ie83a8c5c72ca15067d2809efdef4b7ff8fe0c4cf
tree: afe3c9276a00a8e73339e098c571aaecfc94b329
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/