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