am c50f767e: Merge "logd: build cleanup"

* commit 'c50f767e7ea83fbf3d7dc8477292bccc413427dc':
  logd: build cleanup