Merge "Add support for freezer cgroup"
am: e40d2b1a84

Change-Id: I9658014f701cb41942f5cf04406bde9171f4f791