Merge "build: Fixes mainDexClasses.bat"