am 0ae30250: am 366e2045: Merge "Support --num-threads with --multi-dex (take 2)"

* commit '0ae30250d739e2b191402ce26b855f738b9bb6e5':
  Support --num-threads with --multi-dex (take 2)