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

* commit '3c717e486246ab4eead6fc89c5eeaf90924d622f':
  logd: build breakage