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

Change-Id: I6be9a08f8fce371603cb41016e8ca2ed2a7baad4