Merge "jni: more O_CLOEXECs" am: 0bd511611e am: c37cf98395
am: db8af62777

Change-Id: I34f53d427efb89f295a2027ceffcb5ccbd149e0b