am fb354cd6: am 69ecfdd5: Merge "logd: build breakage"

* commit 'fb354cd6af5bccc42ab1ecabd10fb51e698169b9':
  logd: build breakage