am ac70051a: Merge "Revert "Revert "Clean up image writer patching."""

* commit 'ac70051a6f97025b8a93390b2b5a62e491fc77ca':
  Revert "Revert "Clean up image writer patching.""