[automerger skipped] Merge "CgroupSetupCgroups: don't leak fd." into qt-dev
am: bd0f767dfe -s ours
am skip reason: change_id I6683804bc795fab6798891a4471e5fe58fbffe13 with SHA1 8df75fc304 is in history

Change-Id: I7ae6787cae8472eee881dcf810c82854fec52a4f