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

Change-Id: I46e5342c70bb4da57bea653b0961986f0ca1ebbc