Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" am: 0996f815db am: d50b6e4cae am: 38800822ef
am: 3a97af0ca4

Change-Id: If358c032115239fd53c88906d385d0ff1d183807