Increase thread count, dependent on CPU core count

Change-Id: Idfeb7dd03bb6bc949f30d93d587a0e1e658f269b