Uninstaller: actually use bundled busybox (before mounting partitions)

uninstaller/META-INF/com/google/android/update-binary

@@ -62,38 +62,22 @@ set_perm_data () {
 
 setup_busybox () {
 	mkdir /dev/tmp
+	unzip -oq "${ZIP}" busybox.arm -d "/dev/tmp"
+	unzip -oq "${ZIP}" busybox.x86 -d "/dev/tmp"
 
-	ABI=$(grep_prop ro.product.cpu.abi | cut -c-3)
-	ABI2=$(grep_prop ro.product.cpu.abi2 | cut -c-3)
-	ABILONG=$(grep_prop ro.product.cpu.abi)
-
-	ARCH=arm
-
-	[ "$ABI" = "x86" ] && ARCH=x86
-	[ "$ABI2" = "x86" ] && ARCH=x86
-	[ "$ABILONG" = "arm64-v8a" ] && ARCH=arm64
-	[ "$ABILONG" = "x86_64" ] && ARCH=x86_64
+	if [[ "$(uname -m)" == a* ]]; then
+		local bb_arch=arm
+	else	local bb_arch=x86
+	fi
 
-	case ${ARCH} in
-		arm | arm64 )
-			unzip -oq "${ZIP}" busybox.arm -d "/dev/tmp"
-			BUSY=/dev/tmp/busybox.arm
-		;;
+	mkdir -p /dev/tmp/busybox
+	ln -s /dev/tmp/busybox.${bb_arch} /dev/tmp/busybox/busybox
 
-		x86 | x86_64 )
-			unzip -oq "${ZIP}" busybox.x86 -d "/dev/tmp"
-			BUSY=/dev/tmp/busybox.x86
-		;;
-	esac
+	chmod 0755 /dev/tmp/busybox.${bb_arch}
+	/dev/tmp/busybox.${bb_arch} --install -s /dev/tmp/busybox/
 
 	OLD_PATH=${PATH}
-
-	chmod 0755 ${BUSY}
-	mkdir -p /dev/tmp/busybox
-	ln -s ${BUSY} /dev/tmp/busybox/busybox
-	${BUSY} --install -s /dev/tmp/busybox/
-
-	export PATH="/dev/tmp/busybox:${PATH}"
+	export PATH=/dev/tmp/busybox:/system/bin:/vendor/bin
 }
 
 error () {
@@ -312,6 +296,7 @@ ui_print "**********************"
 ui_print " "
 
 detect_bootmode
+setup_busybox
 mount_partitions
 
 ui_print " << Removing installation logs (if any)"