Merge "Remove mainDexClasses from the SDK"