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

Change-Id: I7d94becaef5ba8d64a35fb714cae02bbccf4f04e