Merge "more O_CLOEXEC" am: 350f48328b
am: 51aec2267c

Change-Id: I36d95d214a9b07c474b8a8c5fdb6dbf15c4cf535