Merge "Encapsulate the optimization info for a dex file in its own class" into pi-dev