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

Change-Id: I07f7934e57654b5b1eeafc2cfaf8902d3bf2270e