Merge "Fix apps with more than one dex file with the same name"