am cdb621bf: retry patch using cache if in-place write fails

Merge commit 'cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp

* commit 'cdb621bfea3083afbea238dbf374826742aca6d0':
  retry patch using cache if in-place write fails