Merge "Clean up the libbase logging test."