Merge "Use O_CLOEXEC at a few places." am: e3857ca43e
am: 4e95d7503e

Change-Id: Ic7a3d4af225abc0c21c76881b00efa7427ec2915