do not wipe cache before flashing files from it + dalvik

Change-Id: I408f41a7c93d86a602c23f334d47f0dc13814c6a
Merge remote-tracking branch 'pa/jb43' into jb43