Merge \"libbase should use its own logging!\"
am: 9f05901b9a

Change-Id: I2260314d55a179004606a0a13d41249933486e9e