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

Change-Id: Icad9120db7d9a01454a5cd321f67d89eaf434ecb