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

Change-Id: I4aec4ccdb0511f70a291b404432ff341c45522fb