Merge "logd: build breakage in user"