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

Change-Id: I2624180a9284beced0677de070b600c21fa24ae6