Merge "Avoid holding mutator lock while calling dlsym"
am: 96e032996b

Change-Id: Iee820f6559fb2726b9b6393a5df92c0fde97a9a8