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

Change-Id: I358eab4877418f2c9a09a8b8d8c4c978de0656d7