Revert changes in r218863, r218864

Summary: The changes introduced in the above two commits are giving
a rough time to one of the build bots. Reverting the changes for the
moment so that the bot can go green again.

Change-Id: Id19f6cb2a8bc292631fac2262268927563d820c2
llvm-svn: 218970
diff --git a/clang/lib/Driver/Tools.h b/clang/lib/Driver/Tools.h
index 6b443ba..8ab1456 100644
--- a/clang/lib/Driver/Tools.h
+++ b/clang/lib/Driver/Tools.h
@@ -614,8 +614,7 @@
 
 namespace arm {
   StringRef getARMFloatABI(const Driver &D, const llvm::opt::ArgList &Args,
-                           const llvm::Triple &Triple,
-                           bool *ExplicitNoFloat = NULL);
+                         const llvm::Triple &Triple);
 }
 namespace XCore {
   // For XCore, we do not need to instantiate tools for PreProcess, PreCompile and Compile.