Merge "Enable multi-dex for dx"