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

* commit 'e1c3a7c19e790a9bbffb1dba012a24de0c9e53e2':
  libbase: logging fixes