Merge "Fix a whitespace bug in mainDexClasses"
am: b2dc75437e

Change-Id: I48bb1c8b8aea8b27198c3d6082d09b07f615c620