Snap for 4425573 from a81928467025eb5624fa4bd97ff739af104ccfef to pi-release

Change-Id: Ib34b0b5da53c231f8e2f93b1ef69668baf0f1f54
diff --git a/JniConstants.cpp b/JniConstants.cpp
index 3ac554b..d96cfea 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -112,8 +112,8 @@
     integerClass = findClass(env, "java/lang/Integer");
     localeDataClass = findClass(env, "libcore/icu/LocaleData");
     longClass = findClass(env, "java/lang/Long");
-    mutableIntClass = findClass(env, "android/util/MutableInt");
-    mutableLongClass = findClass(env, "android/util/MutableLong");
+    mutableIntClass = findClass(env, "libcore/util/MutableInt");
+    mutableLongClass = findClass(env, "libcore/util/MutableLong");
     netlinkSocketAddressClass = findClass(env, "android/system/NetlinkSocketAddress");
     packetSocketAddressClass = findClass(env, "android/system/PacketSocketAddress");
     patternSyntaxExceptionClass = findClass(env, "java/util/regex/PatternSyntaxException");