Merge changes I96998c4b,I161bf03b
am: dd0cd8d88f

Change-Id: I54191d23beed6fa2a2703a5cf8cb688b5c7a50fc
tree: 0b787d43b4da084f018058d08a05c7a0b73e2c5e
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/