Merge "Update mainDexClasses.rules"