Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files"
am: 0996f815db

Change-Id: I8927d4eae11d8f5f65051ae038de336a60b2d462