Merge "Increase default runtest -j to 16." into ics-aah