Merge "Restrict number of testrunner jobs to be equal to # cpus."
am: 249726c999

Change-Id: I9620040f557115a93e939dfca12c2d4816edb235