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

Change-Id: I25a8118f15490a42224f75d8e7b0fb2c51b95bd7