am 990cdb14: am eb69b9a5: am 075828b8: Merge "logd: build breakage in user"

* commit '990cdb149e39e5b4fbac40680ea60cf18beae1a2':
  logd: build breakage in user