diff -r bdaea1ebd0ea -r 96f9a38fb70e make/common/Modules.gmk
--- a/make/common/Modules.gmk	Thu May 05 16:35:36 2016 -0700
+++ b/make/common/Modules.gmk	Thu May 05 22:39:14 2016 -0700
@@ -75,7 +75,6 @@
     java.scripting \
     java.sql.rowset \
     java.smartcardio \
-    jdk.charsets \
     jdk.naming.rmi \
     #
 
@@ -104,6 +103,7 @@
 PLATFORM_MODULES += \
     java.compiler \
     jdk.accessibility \
+    jdk.charsets \
     jdk.crypto.ec \
     jdk.crypto.pkcs11 \
     jdk.dynalink \