am 366e2045: Merge "Support --num-threads with --multi-dex (take 2)"

* commit '366e204530e8e72abaa18fde0daa11c7a327b405':
  Support --num-threads with --multi-dex (take 2)