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

Change-Id: I05bf62c7d4b5d0a98b30ed8b8748d6afe919133f