Revert^2 "Make sure all runtime threads are in the System thread group." am: 80777ed308 am: eeb984af89

Change-Id: Icfb9e0a635193261000ef00fe48688802c523297