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

Change-Id: I8e436755a12d51bc133351daef4548d73ac2a3b7