Merge "sign_target_files_apks: fix recovery patch generation"