Switch back to aosp dalvik cache

Change-Id: I965fb1de97d251da6e90f5da54cdda09173ab7f1