Merge "Make jni_internal_test less spammy." into dalvik-dev