Merge "Remove use of llvm::TargetOptions::NoFramePointerElim"