Merge "Add a shared interface for different types of dex files"