Merge "Fix jni_internal_test dependency."