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

Change-Id: I076eb2b7be05ec9ed2387a3e012f21234392c37d