Merge "Port CRITICAL_JNI_PARAMS from internal master"