am 296bb2af: am c50f767e: Merge "logd: build cleanup"

* commit '296bb2afeccab13841a42cc5f3941d4528be383a':
  logd: build cleanup