Merge "Fix detection of main dex overflow in multidex"