7159136: JDK 7 font manager refactoring left JNI header generation and inclusion out of sync

Reviewed-by: igor, jgodinez

jdk/make/sun/font/Makefile

@@ -62,7 +62,7 @@ FILES_export = \
     java/text/Bidi.java \
     sun/font/FileFont.java \
     sun/font/FileFontStrike.java \
-    sun/font/FontManager.java \
+    sun/font/SunFontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \

jdk/make/sun/font/t2k/Makefile

@@ -52,7 +52,6 @@ include FILES_c.gmk
 FILES_export = \
     java/awt/Font.java \
     sun/font/FileFont.java \
-    sun/font/FontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \

jdk/src/share/native/sun/font/sunFont.c

@@ -29,7 +29,7 @@
 #include "jlong.h"
 #include "sunfontids.h"
 #include "fontscalerdefs.h"
-#include "sun_font_FontManager.h"
+#include "sun_font_SunFontManager.h"
 #include "sun_font_NullFontScaler.h"
 #include "sun_font_StrikeCache.h"