Patcher / SysTest: minor change in DalvikVM detection

patcher/CommonPatcher

@@ -206,6 +206,14 @@ detect_arch () {
 	DALVIKVM_ARCH=$("${FILE}" -m "${BASEDIR}/magic.mgc" -L /system/bin/dalvikvm)
 
 	case ${DALVIKVM_BIN} in
+		dalvikvm32 )
+			export LD_LIBRARY_PATH="/system/lib:/vendor/lib:/system/vendor/lib"
+		;;
+
+		dalvikvm64 )
+			export LD_LIBRARY_PATH="/system/lib64:/vendor/lib64:/system/vendor/lib64"
+		;;
+
 		dalvikvm )
 			case ${DALVIKVM_ARCH} in
 				*32-bit* )
@@ -217,14 +225,6 @@ detect_arch () {
 				;;
 			esac
 		;;
-
-		dalvikvm32 )
-			export LD_LIBRARY_PATH="/system/lib:/vendor/lib:/system/vendor/lib"
-		;;
-
-		dalvikvm64 )
-			export LD_LIBRARY_PATH="/system/lib64:/vendor/lib64:/system/vendor/lib64"
-		;;
 	esac
 
 	export PATH="${BASEDIR}/busybox:/system/bin:/system/xbin"

systest/SysTest

@@ -169,6 +169,14 @@ system_test () {
 	DALVIKVM_ARCH=$("${FILE}" -m "/dev/tmp/magic.mgc" -L /system/bin/dalvikvm)
 
 	case ${DALVIKVM_BIN} in
+		dalvikvm32 )
+			LD="/system/lib:/vendor/lib:/system/vendor/lib"
+		;;
+
+		dalvikvm64 )
+			LD="/system/lib64:/vendor/lib64:/system/vendor/lib64"
+		;;
+
 		dalvikvm )
 			case ${DALVIKVM_ARCH} in
 				*32-bit* )
@@ -180,14 +188,6 @@ system_test () {
 				;;
 			esac
 		;;
-
-		dalvikvm32 )
-			LD="/system/lib:/vendor/lib:/system/vendor/lib"
-		;;
-
-		dalvikvm64 )
-			LD="/system/lib64:/vendor/lib64:/system/vendor/lib64"
-		;;
 	esac
 
 	SERVICES_JAR_DEX=$(unzip -lq /system/framework/services.jar | grep classes.dex)