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

Change-Id: I5f68973f7fabf96e7271436fdffd64bc8346b84d