Fix multi-image TODOs in patchoat.

- Reinstated checks that were still valid (one check was removed).
- Removed unused path that patches only images.

Bug: 26317072

Change-Id: I0e140cb110abbfa469c097c805657ecfdc8552d6