Merge "Fix mainDexClasses with obfuscation."