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

* commit 'eb69b9a5020b15e97b448245b63cfa7a6171cd2b':
  logd: build breakage in user