Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files"