Merge "build: Fixes mainDexClasses.bat"
am: 4b4ab11c29

Change-Id: Ib560f256d1d8654b98b8f7ccb54c16ea6dfbe57a