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

* commit '92352303d2165387d14174da7a8f701868f1d97c':
  Fix detection of main dex overflow in multidex