am 03581ce1: am 46a005c3: am 2b5f5fb9: Merge "base logging: fix errno restoring, severity conditionality, dangling ifs"

* commit '03581ce1eadfe03a13060fc478d876f46735be81':
  base logging: fix errno restoring, severity conditionality, dangling ifs