multi-threaded builds seem to work again
update build thread comment text in build.sh as well as rebuild.sh
Merge remote-tracking branch 'upstream/master'

# By Eric
# Via Eric
* upstream/master:
  update build thread comment text in build.sh as well as rebuild.sh
  multi-threaded builds seem to work again