am 6c91a095: Merge "Fix non-PLT text relocation introduced by CL 79466"

* commit '6c91a095d770140d50b1a9831733fa5b7f81868b':
  Fix non-PLT text relocation introduced by CL 79466