Merge changes I8c58d6bd,I0a19fd87
am: c389b34600

Change-Id: I61b519494c1b78de65ae37e0e43bb44ae6a95160
tree: 4344f75778593f83e100614517111e8408aae83b
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/