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

Change-Id: I8b83dee4ad2a90deb35b9728009f85bbaa514b15