am 9cb4af39: (-s ours) am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"

* commit '9cb4af39af344998be06e91ac97b7cbf24c03904':