am 2fda5f4a: Merge "Fix detection of main dex overflow in multidex"

* commit '2fda5f4a27ee928a90d223a46a9ca46bc76f7794':
  Fix detection of main dex overflow in multidex