am c9863702: am b3ef71c0: Merge "Revert "Support --num-threads with --multi-dex""

* commit 'c986370236cdd039727341c85b26ef2bd8ad5eee':
  Revert "Support --num-threads with --multi-dex"