Merge "Rollback 'Use old JNI on robolectric environment'." into main