Merge "Fix a couple more cases of missing CLOEXEC."