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

Change-Id: I0b58446b03c21fab9e83497f7d84ec5ff6f4d9ad