Merge "Support --num-threads with --multi-dex (take 2)"