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

Change-Id: Ia4e37933ee5742f74e7d58e4eaca71f89954aa00