Merge "logd: test drop __unused"