Merge "Clean up the libbase logging test."
am: af6a185fb4

Change-Id: If20a1c114659fc6470c308a19a0e3e56f1c12cf3