Merge "Revert "Avoid fd leaks when jniCreateFileDescriptor encounters OOME""