am 6a9b8b7f: am 6e28e432: Merge "Support --num-threads with --multi-dex"

* commit '6a9b8b7fa2bfac98766a558fee7aa8938fac7678':
  Support --num-threads with --multi-dex