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

* commit '2a689934bdee8799fcaf428c20d050f15e1bc5c0':
  Remove use of llvm::TargetOptions::NoFramePointerElim