upstream merge

Author: krvstek

utils.sh

@@ -563,7 +563,7 @@ build_uni() {
     fi
 	patched_apk="${TEMP_DIR}/${app_name_l}-${brand_f}-${version_f}-${arch_f}.apk"
 
-	local stock_apk_to_patch="${stock_apk}.stripped"
+	local stock_apk_to_patch="${stock_apk}.stripped.apk"
 	cp -f "$stock_apk" "$stock_apk_to_patch"
 	if [ "$arch" = "arm64-v8a" ]; then
 		zip -d "$stock_apk_to_patch" "lib/armeabi-v7a/*" "lib/x86_64/*" "lib/x86/*" >/dev/null 2>&1 || :