Merge "logd: build cleanup"