Merge "Fix SystemServerInitThreadPool size on latest device." into qt-dev am: 746fbc30da
am: a743d33338

Change-Id: If0114df067bca511d106dbde86f9df88f9e4e162