Merge "Replace hardcoded cgroup paths"
am: 1e4b9d7583

Change-Id: Idb41db6bbcacdfc14b63973f8e6ab0011a18d543