--- a/make/common/TestFilesCompilation.gmk	Wed Sep 09 09:44:57 2015 +0200
+++ b/make/common/TestFilesCompilation.gmk	Fri Sep 11 10:05:49 2015 +0200
@@ -32,8 +32,6 @@
 
 
 include NativeCompilation.gmk
-# FIXME: This is a bad fix currently needed due to JDK-8064808 not being resolved.
-include $(JDK_TOPDIR)/make/Tools.gmk
 
 # Setup make rules for creating a set of native test files (libraries or
 # executables). This will locate native files matching a certain pattern,