Merge "Generalize atomic_method_ref_map to support dex references"