Merge "Move startup thread pool back into runtime"
am: c4fc53ae1e

Change-Id: I051c4b66571c049ccb7682143f880760ca27cd84