Merge "logd: remove unnecessary static"