Merge "Fix non-PLT text relocation introduced by CL 79466"