Merge "logd: Always build logd"