Merge "Fix PIC relocations for non-Bsymbolic builds"