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

Change-Id: Ie0e6f5e6847a18515d2b41e43ab459ab1c1feece