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

Change-Id: Icdda191805938bda19f3b2d0219993e786526c0a