Merge "Reenable __work_around_b_24465209__ for x86 linker"