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

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