Merge "Generalize atomic_method_ref_map to support dex references" am: 0d32f4eb35
am: d5c66a9a6f

Change-Id: I749ef01b273448a6f43fd3d803d8487555e9c8fb