Merge "Fix JNIEnv-on-wrong-thread abort message."