Merge "even more O_CLOEXECs!" am: bb5b645454
am: 6130adad16

Change-Id: Id1538b24d3d213711ad014634071957d5834016f