[automerger skipped] Rebuild recovery-from-boot patch when calling...

[automerger skipped] Rebuild recovery-from-boot patch when calling add_img_to_target_files. am: 97a6690a am: 4252c365 -s ours
am: 6565268b -s ours
am skip reason: change_id I5859e30be63bfd54398cf41fd2d907f15285f560 with SHA1 4978fa99 is in history

Change-Id: Ic7fec6b1ccca286bdf7776504d2979b03233b21e