diff -r 0d45108a3e62 -r 1c305b7233b3 jdk/src/java.base/share/classes/sun/nio/cs/StringUTF16.java
--- a/jdk/src/java.base/share/classes/sun/nio/cs/StringUTF16.java	Thu Dec 10 06:09:36 2015 +0000
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/StringUTF16.java	Thu Dec 10 10:04:41 2015 +0000
@@ -25,8 +25,8 @@
 
 package sun.nio.cs;
 
-import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET;
-import static sun.misc.Unsafe.ARRAY_BYTE_INDEX_SCALE;
+import static jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_BYTE_INDEX_SCALE;
 
 class StringUTF16 {
 
@@ -35,5 +35,5 @@
                               ARRAY_BYTE_BASE_OFFSET + ARRAY_BYTE_INDEX_SCALE * index * 2L);
     }
 
-    private static final sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+    private static final jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
 }