am 387f5d21: Merge "Disable FPIE just for Clang."

* commit '387f5d21fd53d7ad48d7f23f2722d2cddc699763':
  Disable FPIE just for Clang.