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

* commit '5dbffeda03de098dbb51016bfa7bd62d6c7715bc':
  logd: build cleanup