Merge "logd: Build Breakage"