Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev am: fbe70a3e93
am: 6c00eb1f31

Change-Id: Ieee5dcff07426c4b55ae33ae8247fd792d622b11