Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv."