Merge "libbase: fix libbase_test.logging.StdioLogger." am: 5dfe1e81d4
am: 01ffe657b3

Change-Id: I2a2fbc4f26277f965f90837a5efeb330c51d7330