Merge "Avoid holding mutator lock while calling dlsym"