Revert "gapps: Thoroughly remove SuW"

This reverts commit 5caba031a6.

build/meta/com/google/android/update-binary

@@ -63,8 +63,8 @@ if [ -d $SYSTEM/lib64 ]; then
   LD_PATH=$SYSTEM/lib64
 fi
 
-#LOWMEM=1572864
+LOWMEM=1572864
-#MEM=`cat /proc/meminfo | head -1 | sed 's/[^0-9]*//g'`
+MEM=`cat /proc/meminfo | head -1 | sed 's/[^0-9]*//g'`
 
 ui_print "Extracting files"
 cd /tmp
@@ -73,7 +73,7 @@ exec_util "rm -rf META-INF"
 cd system
 #if [ "$MEM" -lt "$LOWMEM" ]; then
 #  ui_print "Low RAM device detected, removing Google SuW"
-#  exec_util "rm -rf priv-app/SetupWizard"
+  exec_util "rm -rf priv-app/SetupWizard"
 #fi
 ui_print "Generating addon.d file"
 cat addon.d/addond_head > addon.d/30-gapps.sh

common/Android.mk

@@ -147,6 +147,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := SetupWizard
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.google.android.maps
 LOCAL_MODULE_OWNER := gapps

common/common-vendor.mk

@@ -31,4 +31,5 @@ PRODUCT_PACKAGES += \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
+    SetupWizard \
     com.google.android.maps

proprietary-files-common.txt

@@ -10,8 +10,7 @@
 -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
 -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
 -priv-app/Phonesky/Phonesky.apk;PRESIGNED
-# Temp disabled as all 8.1 versions crash
+-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
-#-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
 
 -framework/com.google.android.maps.jar;PRESIGNED