Merge "Resolve x86_64 relocations in RS."