Merge "Clean up the libbase logging test." am: af6a185fb4 am: 2d69537b58
am: 39cde3b734

Change-Id: I4f5ece60c3706971c255d1cd0576ced345aada43