Merge "Replace hardcoded cgroup paths" am: 1e4b9d7583
am: 26cbd94d67

Change-Id: I9bd49a1757384bf72902fca46695fad237ce09ff