am cc7b941f: am f598f762: Merge "Split out the optimized dex file handling into its own file." into gingerbread

Merge commit 'cc7b941f9eaa92e2a4e7795a2c2c98d4bf15fc44'

* commit 'cc7b941f9eaa92e2a4e7795a2c2c98d4bf15fc44':
  Split out the optimized dex file handling into its own file.