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

Change-Id: Ic8d9ddc189bd2b2370b7e13f1e1fd3a8ea86914d