Merge "Add a shared interface for different types of dex files"
am: 656e97f949

Change-Id: I59ca134547cecd584fc0fcf65d07f31f8b376f2f