[automerger skipped] Merge "Replace hardcoded cgroup paths" am: 1e4b9d7583 am: 26cbd94d67
am: 87e6e5058f -s ours
am skip reason: change_id Ic2dc2a94328cf1927fafaa9506537aeb213df413 with SHA1 3fc4af6568 is in history

Change-Id: I044d23a6c2c9bc3b9510ed9b7021e0d278db8eaa