am 95934be3: am 03c7547c: Merge change 24425 into eclair

Merge commit '95934be333d74ac48c19ae40a8207361a913516a'

* commit '95934be333d74ac48c19ae40a8207361a913516a':
  vm: Add support for using scheduler policies instead of cgroups

diff --cc vm/Globals.h
Simple merge

diff --cc vm/Init.c
Simple merge

diff --cc vm/Thread.c
Simple merge

diff --cc vm/Thread.h
Simple merge