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

Change-Id: Ieb6deb30665d480f543a6e8d70b888b8facb69d1