Merge "Revert "Support --num-threads with --multi-dex""