Merge "Add vendor cgroups and task_profiles support" am: 3af39f36cc am: 6f8eee612c
am: c6ee857075

Change-Id: I0dd92817ee12509e3e26d005bf28229292cc3246