[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 -s ours am: 9900e923 -s ours
am: 0034b284 -s ours
am skip reason: change_id I5859e30be63bfd54398cf41fd2d907f15285f560 with SHA1 4978fa99 is in history

Change-Id: I1904a77cee1f95c50a15b2512dafd7e5c88bb904