Merge "Fix a whitespace bug in mainDexClasses"