Merge "rebuild recovery patch in sign_target_files_apks"