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

Change-Id: I1067fee490ec8b3665e6787384f536feb801c3ae