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

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