[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 60bf9c7007  -s ours

Change-Id: Ie17a382505e1b8f6fb135a415f6fa8c9671354e4
tree: 7ef3ef397f2c6848bd48d37e8582100df42f93c9
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/