Revert "Disable /cache/dalvik-cache (temporarily?)"

This reverts commit 59e79c413311dc6796683dc34ce00e5842e7f3cc.

Change-Id: I81bc9a338b7bf2c40fa1850981359505e36ffa29
Fix merge error

Change-Id: I9a9ffebaac3364da3408b4c4703d47c159dc24ae