am f9d80760: am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"

* commit 'f9d807603a4a2ff3847e69f50d45ba59c1450b08':
  libbase: logging fixes