am 374fb150: am 535950bb: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '374fb150a9447fe015d3417c94673378f9d016c8':
  Fix PIC relocations for non-Bsymbolic builds