am 1374c48b: am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"

* commit '1374c48b1b92a2713a8126402ab87877ee49fb5d':