Merge "dlfcn: update ifdef around old_name_"