Revert "Change dexopt layout"

This reverts commit 1880dcb47dd6e54f4d502154aa028e0cf555484d.