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

Change-Id: I8e2fb59041970ea4426da9ab634c0ae44096d87f