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

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