Revert "Switch back to aosp dalvik cache"

This reverts commit 0d3455af991dd4dc2b59be04dee21f0f95b22c02.