am 65d6cdeb: Merge "Remove use of llvm::TargetOptions::NoFramePointerElim"

* commit '65d6cdeb96de32c789d285626db235b3455147d7':
  Remove use of llvm::TargetOptions::NoFramePointerElim