Revert "d2-common: dex-opt to cache"

This reverts commit 4e9605f