Merge "more O_CLOEXEC"
am: 350f48328b

Change-Id: I14c8a19b241e29ad4a9bd74d8ed904aa2ef7e5b3