Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev