Merge "Enable multi-dex for coverage builds to fix breakage"