Revert back to aosp dalvik cache

Change-Id: I4992c78b9bf26e80725dbd47833fd9d676ae8ff6