Merge "Support --num-threads with --multi-dex (take 2)" into lmp-mr1-dev