Merge "Add support for freezer cgroup" am: e40d2b1a84 am: d486138708
am: 5ba5ec7c08

Change-Id: I91a344faccdac2554e99358f1cd2bbaf39d018d8