Merge "CgroupSetupCgroups: don't leak fd."
am: cc5e2dc2e8

Change-Id: I0e5f112c0d6d17c6e7581017c2679f58cdebc6d5