Merge "Split out the optimized dex file handling into its own file." into gingerbread