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

Change-Id: I392b5bcc8ebd6786a13e31a5d65c81d23ffd9c56