Merge "logd: build breakage aosp-brillo-master @ 2508494"
am: 727aeb6686

* commit '727aeb66865e1f8450c93404d6db5b6274e0df13':
  logd: build breakage aosp-brillo-master @ 2508494