am 897cd3d4: am afae9fd8: Merge "Fix uses of -fPIC and -fPIE."

* commit '897cd3d494272b8a6a12f0fb6d02bfe7426a309c':
  Fix uses of -fPIC and -fPIE.