Merge "even more O_CLOEXECs!"
am: bb5b645454

Change-Id: I8435d69b72dbbbc881bbd43c7a640f3460e5777a