Merge "logd: make behavior more consistent across builds."