am 69ecfdd5: Merge "logd: build breakage"

* commit '69ecfdd570c30ccdf541d16298e7a7e8a48de8b7':
  logd: build breakage