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

* commit '075828b83bd903465442dc5021004266d56e075c':
  logd: build breakage in user