Merge "Enable multi-dex content per file in dexlist/dump."