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

Change-Id: I20d3df935148e74985109b96b3410ca9c68925a7