Merge "logd: build breakage"