Merge "Support dx generating multiple dex files."