Merge "deprecate TARGET_USES_LOGD"