Revert "Revert "Switch back to aosp dalvik cache""

This reverts commit a0abd00641bdb981c20ed5039b65e2d5e17a759c.