diff --git a/build/gapps.sh b/build/gapps.sh
index b800cf2..6ae6bf1 100644
--- a/build/gapps.sh
+++ b/build/gapps.sh
@@ -25,26 +25,28 @@ function printdone(){
   echo "$(tput setaf 2)$1$(tput sgr 0)"
 }
 
+function clean(){
+    echo "Cleaning up..."
+    rm -r $OUT/$GARCH
+    rm /tmp/$BUILDZIP
+    return $?
+}
+
+function Gfailed(){
+    printerr "Build failed, check $GLOG"
+    exit 1
+}
+
 function create(){
-    if [ -f $GLOG ]; then
-        rm -f $GLOG
-    fi
+    test -f $GLOG && rm -f $GLOG
     echo "Starting GApps compilation" > $GLOG
     echo "ARCH= $GARCH" >> $GLOG
     echo "OS= $(uname -s -r)" >> $GLOG
     echo "NAME= $(whoami) at $(uname -n)" >> $GLOG
     PREBUILT=$TOP/prebuilt/gapps/$GARCH
-    if [ -d $OUT/$GARCH ]; then
-        echo "Previous build found for $GARCH!" >> $GLOG
-    else
-        echo "No previous build found for $GARCH!" >> $GLOG
-        if [ -d $OUT ]; then
-            echo "OUT directory detected at: $OUT" >> $GLOG
-        else
-            mkdir $OUT
-        fi
-        mkdir $OUT/$GARCH && echo "Created build directories" >> $GLOG
-    fi
+    test -d $OUT || mkdir $OUT;
+    test -d $OUT/$GARCH || mkdir -p $OUT/$GARCH
+    echo "Build directories are now ready" >> $GLOG
     echo "Getting prebuilts..."
     echo "Copying stuffs" >> $GLOG
     cp -r $PREBUILT $OUT/$GARCH >> $GLOG
@@ -53,7 +55,7 @@ function create(){
 }
 
 function zipit(){
-    BUILDZIP=gapps-$ANDROIDV-$DATE.zip
+    BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip
     echo "Importing installation scripts..."
     cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG
     echo "Creating package..."
@@ -63,7 +65,7 @@ function zipit(){
     cd $TOP
     if [ -f /tmp/$BUILDZIP ]; then
         echo "Signing zip..."
-        java -Xmx2048m -jar $TOP/build/sign/signapk.jar -w $TOP/build/sign/testkey.x509.pem $TOP/build/sign/testkey.pk8 /tmp/$BUILDZIP $OUT/$GARCH/$BUILDZIP >> $GLOG
+        java -Xmx2048m -jar $TOP/build/sign/signapk.jar -w $TOP/build/sign/testkey.x509.pem $TOP/build/sign/testkey.pk8 /tmp/$BUILDZIP $OUT/$BUILDZIP >> $GLOG
     else
         printerr "Couldn't zip files!"
         echo "Couldn't find unsigned zip file, aborting" >> $GLOG
@@ -75,7 +77,9 @@ function getmd5(){
     if [ -x $(which md5sum) ]; then
         echo "md5sum is installed, getting md5..." >> $GLOG
         echo "Getting md5sum..."
-        GMD5=$(md5sum $OUT/$GARCH/$BUILDZIP)
+        GMD5=$(md5sum $OUT/$BUILDZIP)
+        echo -e "$GMD5" > $OUT/gapps-$ANDROIDV-$GARCH-$DATE.md5
+        echo "md5 exported at $OUT/gapps-$ANDROIDV-$GARCH-$DATE.md5"
         return 0
     else
         echo "md5sum is not installed, aborting" >> $GLOG
@@ -89,6 +93,12 @@ function getmd5(){
 GARCH=$1
 create
 LASTRETURN=$?
+if [ -x $(which realpath) ]; then
+    echo "Realpath found!" >> $GLOG
+else
+    TOP=$(cd . && pwd) # some os X love
+    echo "No realpath found!" >> $GLOG
+fi
 if [ "$LASTRETURN" == 0 ]; then
     zipit
     LASTRETURN=$?
@@ -96,19 +106,21 @@ if [ "$LASTRETURN" == 0 ]; then
         getmd5
         LASTRETURN=$?
         if [ "$LASTRETURN" == 0 ]; then
-            echo "Done!" >> $GLOG
-            printdone "Build completed: $OUT/$GARCH/$BUILDZIP"
-            printdone "            md5: $GMD5"
-            exit 0
+            clean
+            LASTRETURN=$?
+            if [ "$LASTRETURN" == 0 ]; then
+                echo "Done!" >> $GLOG
+                printdone "Build completed: $GMD5"
+                exit 0
+            else
+                Gfailed
+            fi
         else
-            printerr "Build failed, check $GLOG"
-            exit 1
+            Gfailed
         fi
     else
-        printerr "Build failed, check $GLOG"
-        exit 1
+        Gfailed
     fi
 else
-    printerr "Build failed, check $GLOG"
-    exit 1
+    Gfailed
 fi
diff --git a/build/meta/com/google/android/updater-script b/build/meta/com/google/android/updater-script
index da02655..777bf1a 100644
--- a/build/meta/com/google/android/updater-script
+++ b/build/meta/com/google/android/updater-script
@@ -5,8 +5,8 @@ show_progress(1, 15);
 package_extract_dir("arch", "/system");
 package_extract_dir("common", "/system");
 set_perm(0, 0, 0777, "/system/gapps_scripts.sh");
-run_program("/systen/gapps_scripts.sh", "");
-delete("/system/gapps_scripts");
+run_program("/system/gapps_scripts.sh", "");
+delete("/system/gapps_scripts.sh");
 show_progress(1, 15);
 set_metadata_recursive("/system/addon.d", "uid", 0, "gid", 0, "dmode", 0755, "fmode", 0755, "capabilities", 0x0, "selabel", "u:object_r:system_file:s0");
 set_metadata_recursive("/system/app", "uid", 0, "gid", 0, "dmode", 0755, "fmode", 0644, "capabilities", 0x0, "selabel", "u:object_r:system_file:s0");
diff --git a/out/arm/arch/addon.d/30-gapps.sh b/out/arm/arch/addon.d/30-gapps.sh
new file mode 100644
index 0000000..b0fcadf
--- /dev/null
+++ b/out/arm/arch/addon.d/30-gapps.sh
@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arch/addon.d/31-faceunlock.sh b/out/arm/arch/addon.d/31-faceunlock.sh
new file mode 100644
index 0000000..aa16b4f
--- /dev/null
+++ b/out/arm/arch/addon.d/31-faceunlock.sh
@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arch/app/FaceLock/FaceLock.apk b/out/arm/arch/app/FaceLock/FaceLock.apk
new file mode 100644
index 0000000..c747086
Binary files /dev/null and b/out/arm/arch/app/FaceLock/FaceLock.apk differ
diff --git a/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so differ
diff --git a/out/arm/arch/arm/addon.d/30-gapps.sh b/out/arm/arch/arm/addon.d/30-gapps.sh
new file mode 100644
index 0000000..b0fcadf
--- /dev/null
+++ b/out/arm/arch/arm/addon.d/30-gapps.sh
@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arch/arm/addon.d/31-faceunlock.sh b/out/arm/arch/arm/addon.d/31-faceunlock.sh
new file mode 100644
index 0000000..aa16b4f
--- /dev/null
+++ b/out/arm/arch/arm/addon.d/31-faceunlock.sh
@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arch/arm/app/FaceLock/FaceLock.apk b/out/arm/arch/arm/app/FaceLock/FaceLock.apk
new file mode 100644
index 0000000..c747086
Binary files /dev/null and b/out/arm/arch/arm/app/FaceLock/FaceLock.apk differ
diff --git a/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so differ
diff --git a/out/arm/arch/arm/lib/libfacelock_jni.so b/out/arm/arch/arm/lib/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arch/arm/lib/libfacelock_jni.so differ
diff --git a/out/arm/arch/arm/lib/libfilterpack_facedetect.so b/out/arm/arch/arm/lib/libfilterpack_facedetect.so
new file mode 100644
index 0000000..a48ef48
Binary files /dev/null and b/out/arm/arch/arm/lib/libfilterpack_facedetect.so differ
diff --git a/out/arm/arch/arm/lib/libgoogle_hotword_jni.so b/out/arm/arch/arm/lib/libgoogle_hotword_jni.so
new file mode 100644
index 0000000..77c2b56
Binary files /dev/null and b/out/arm/arch/arm/lib/libgoogle_hotword_jni.so differ
diff --git a/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so b/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so
new file mode 100644
index 0000000..7ce9f01
Binary files /dev/null and b/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so differ
diff --git a/out/arm/arch/arm/lib/libjni_latinimegoogle.so b/out/arm/arch/arm/lib/libjni_latinimegoogle.so
new file mode 100644
index 0000000..33e3bef
Binary files /dev/null and b/out/arm/arch/arm/lib/libjni_latinimegoogle.so differ
diff --git a/out/arm/arch/arm/lib/libvcdecoder_jni.so b/out/arm/arch/arm/lib/libvcdecoder_jni.so
new file mode 100644
index 0000000..dfa5e35
Binary files /dev/null and b/out/arm/arch/arm/lib/libvcdecoder_jni.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
new file mode 100644
index 0000000..9dadc7a
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
new file mode 100644
index 0000000..712a056
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
new file mode 100644
index 0000000..b0c048d
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
new file mode 100644
index 0000000..12da616
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
new file mode 100644
index 0000000..aa890ee
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
new file mode 100644
index 0000000..aff3661
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
new file mode 100644
index 0000000..7d1a050
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
new file mode 100644
index 0000000..3d53bf0
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
new file mode 100644
index 0000000..63401b1
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
new file mode 100644
index 0000000..b5087e4
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
new file mode 100644
index 0000000..2966172
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
new file mode 100644
index 0000000..8c68b1f
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
new file mode 100644
index 0000000..e18424c
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
new file mode 100644
index 0000000..fe32c33
Binary files /dev/null and b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
diff --git a/out/arm/arch/arm/priv-app/Velvet/Velvet.apk b/out/arm/arch/arm/priv-app/Velvet/Velvet.apk
new file mode 100644
index 0000000..d8e7627
Binary files /dev/null and b/out/arm/arch/arm/priv-app/Velvet/Velvet.apk differ
diff --git a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
new file mode 120000
index 0000000..8d0a12b
--- /dev/null
+++ b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/prebuilt/gapps/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
similarity index 100%
rename from prebuilt/gapps/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
rename to out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
diff --git a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
new file mode 120000
index 0000000..cd1fe04
--- /dev/null
+++ b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/arch/lib/libfacelock_jni.so b/out/arm/arch/lib/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arch/lib/libfacelock_jni.so differ
diff --git a/out/arm/arch/lib/libfilterpack_facedetect.so b/out/arm/arch/lib/libfilterpack_facedetect.so
new file mode 100644
index 0000000..a48ef48
Binary files /dev/null and b/out/arm/arch/lib/libfilterpack_facedetect.so differ
diff --git a/out/arm/arch/lib/libgoogle_hotword_jni.so b/out/arm/arch/lib/libgoogle_hotword_jni.so
new file mode 100644
index 0000000..77c2b56
Binary files /dev/null and b/out/arm/arch/lib/libgoogle_hotword_jni.so differ
diff --git a/out/arm/arch/lib/libgoogle_recognizer_jni_l.so b/out/arm/arch/lib/libgoogle_recognizer_jni_l.so
new file mode 100644
index 0000000..7ce9f01
Binary files /dev/null and b/out/arm/arch/lib/libgoogle_recognizer_jni_l.so differ
diff --git a/out/arm/arch/lib/libjni_latinimegoogle.so b/out/arm/arch/lib/libjni_latinimegoogle.so
new file mode 100644
index 0000000..33e3bef
Binary files /dev/null and b/out/arm/arch/lib/libjni_latinimegoogle.so differ
diff --git a/out/arm/arch/lib/libvcdecoder_jni.so b/out/arm/arch/lib/libvcdecoder_jni.so
new file mode 100644
index 0000000..dfa5e35
Binary files /dev/null and b/out/arm/arch/lib/libvcdecoder_jni.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
new file mode 100644
index 0000000..9dadc7a
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
new file mode 100644
index 0000000..712a056
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
new file mode 100644
index 0000000..b0c048d
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
new file mode 100644
index 0000000..12da616
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
new file mode 100644
index 0000000..aa890ee
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
new file mode 100644
index 0000000..aff3661
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
new file mode 100644
index 0000000..7d1a050
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
new file mode 100644
index 0000000..3d53bf0
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
new file mode 100644
index 0000000..63401b1
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
new file mode 100644
index 0000000..b5087e4
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
new file mode 100644
index 0000000..2966172
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
new file mode 100644
index 0000000..8c68b1f
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
new file mode 100644
index 0000000..e18424c
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
new file mode 100644
index 0000000..fe32c33
Binary files /dev/null and b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
diff --git a/out/arm/arch/priv-app/Velvet/Velvet.apk b/out/arm/arch/priv-app/Velvet/Velvet.apk
new file mode 100644
index 0000000..d8e7627
Binary files /dev/null and b/out/arm/arch/priv-app/Velvet/Velvet.apk differ
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
new file mode 120000
index 0000000..8d0a12b
--- /dev/null
+++ b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
new file mode 120000
index 0000000..30b7122
--- /dev/null
+++ b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
new file mode 120000
index 0000000..cd1fe04
--- /dev/null
+++ b/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/arm/addon.d/30-gapps.sh b/out/arm/arm/addon.d/30-gapps.sh
new file mode 100644
index 0000000..b0fcadf
--- /dev/null
+++ b/out/arm/arm/addon.d/30-gapps.sh
@@ -0,0 +1,76 @@
+#!/sbin/sh
+#
+# /system/addon.d/70-gapps.sh
+#
+. /tmp/backuptool.functions
+
+list_files() {
+cat <<EOF
+addon.d/30-gapps.sh
+app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
+app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
+etc/permissions/com.google.android.camera2.xml
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/features.xml
+framework/com.google.camera2.jar
+framework/com.google.android.maps.jar
+framework/com.google.android.media.effects.jar
+framework/com.google.widevine.software.drm.jar
+lib/libfilterpack_facedetect.so
+lib/libgoogle_hotword_jni.so
+lib/libgoogle_recognizer_jni_l.so
+lib/libjni_latinimegoogle.so
+priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
+priv-app/GoogleFeedback/GoogleFeedback.apk
+priv-app/GoogleLoginService/GoogleLoginService.apk
+priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
+priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
+priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
+priv-app/Phonesky/Phonesky.apk
+priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
+priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
+priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
+priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
+priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
+priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
+priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
+priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
+priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
+priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
+priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
+priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
+priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arm/addon.d/31-faceunlock.sh b/out/arm/arm/addon.d/31-faceunlock.sh
new file mode 100644
index 0000000..aa16b4f
--- /dev/null
+++ b/out/arm/arm/addon.d/31-faceunlock.sh
@@ -0,0 +1,54 @@
+#!/sbin/sh
+#
+# /system/addon.d/71-gapps-faceunlock.sh
+#
+
+. /tmp/backuptool.functions
+
+
+
+
+list_files() {
+cat <<EOF
+app/FaceLock/FaceLock.apk
+app/FaceLock/lib/arm/libfacelock_jni.so
+lib/libfacelock_jni.so
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
+vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
+vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
+vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
+EOF
+}
+
+case "$1" in
+  backup)
+    list_files | while read FILE DUMMY; do
+      backup_file $S/$FILE
+    done
+  ;;
+  restore)
+    list_files | while read FILE REPLACEMENT; do
+      R=""
+      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
+      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
+    done
+  ;;
+  pre-backup)
+    # Stub
+  ;;
+  post-backup)
+    # Stub
+  ;;
+  pre-restore)
+    # Stub
+  ;;
+  post-restore)
+    # Stub
+  ;;
+esac
diff --git a/out/arm/arm/app/FaceLock/FaceLock.apk b/out/arm/arm/app/FaceLock/FaceLock.apk
new file mode 100644
index 0000000..c747086
Binary files /dev/null and b/out/arm/arm/app/FaceLock/FaceLock.apk differ
diff --git a/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so differ
diff --git a/out/arm/arm/lib/libfacelock_jni.so b/out/arm/arm/lib/libfacelock_jni.so
new file mode 100644
index 0000000..e85ef56
Binary files /dev/null and b/out/arm/arm/lib/libfacelock_jni.so differ
diff --git a/out/arm/arm/lib/libfilterpack_facedetect.so b/out/arm/arm/lib/libfilterpack_facedetect.so
new file mode 100644
index 0000000..a48ef48
Binary files /dev/null and b/out/arm/arm/lib/libfilterpack_facedetect.so differ
diff --git a/out/arm/arm/lib/libgoogle_hotword_jni.so b/out/arm/arm/lib/libgoogle_hotword_jni.so
new file mode 100644
index 0000000..77c2b56
Binary files /dev/null and b/out/arm/arm/lib/libgoogle_hotword_jni.so differ
diff --git a/out/arm/arm/lib/libgoogle_recognizer_jni_l.so b/out/arm/arm/lib/libgoogle_recognizer_jni_l.so
new file mode 100644
index 0000000..7ce9f01
Binary files /dev/null and b/out/arm/arm/lib/libgoogle_recognizer_jni_l.so differ
diff --git a/out/arm/arm/lib/libjni_latinimegoogle.so b/out/arm/arm/lib/libjni_latinimegoogle.so
new file mode 100644
index 0000000..33e3bef
Binary files /dev/null and b/out/arm/arm/lib/libjni_latinimegoogle.so differ
diff --git a/out/arm/arm/lib/libvcdecoder_jni.so b/out/arm/arm/lib/libvcdecoder_jni.so
new file mode 100644
index 0000000..dfa5e35
Binary files /dev/null and b/out/arm/arm/lib/libvcdecoder_jni.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
new file mode 100644
index 0000000..9dadc7a
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
new file mode 100644
index 0000000..712a056
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
new file mode 100644
index 0000000..b0c048d
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
new file mode 100644
index 0000000..12da616
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
new file mode 100644
index 0000000..aa890ee
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
new file mode 100644
index 0000000..aff3661
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
new file mode 100644
index 0000000..7d1a050
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
new file mode 100644
index 0000000..3d53bf0
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
new file mode 100644
index 0000000..63401b1
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
new file mode 100644
index 0000000..b5087e4
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
new file mode 100644
index 0000000..2966172
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
new file mode 100644
index 0000000..8c68b1f
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
new file mode 100644
index 0000000..e18424c
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
new file mode 100644
index 0000000..fe32c33
Binary files /dev/null and b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
diff --git a/out/arm/arm/priv-app/Velvet/Velvet.apk b/out/arm/arm/priv-app/Velvet/Velvet.apk
new file mode 100644
index 0000000..d8e7627
Binary files /dev/null and b/out/arm/arm/priv-app/Velvet/Velvet.apk differ
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
new file mode 120000
index 0000000..8d0a12b
--- /dev/null
+++ b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
new file mode 120000
index 0000000..30b7122
--- /dev/null
+++ b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
new file mode 120000
index 0000000..cd1fe04
--- /dev/null
+++ b/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
@@ -0,0 +1 @@
+/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
new file mode 100644
index 0000000..0c4d7b9
Binary files /dev/null and b/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk differ
diff --git a/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
new file mode 100644
index 0000000..551fe59
Binary files /dev/null and b/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ
diff --git a/out/arm/common/etc/permissions/com.google.android.camera2.xml b/out/arm/common/etc/permissions/com.google.android.camera2.xml
new file mode 100644
index 0000000..97d5a2f
--- /dev/null
+++ b/out/arm/common/etc/permissions/com.google.android.camera2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.camera2"
+            file="/system/framework/com.google.android.camera2.jar" />
+</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.android.maps.xml b/out/arm/common/etc/permissions/com.google.android.maps.xml
new file mode 100644
index 0000000..5be5c2c
--- /dev/null
+++ b/out/arm/common/etc/permissions/com.google.android.maps.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.maps"
+            file="/system/framework/com.google.android.maps.jar" />
+</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.android.media.effects.xml b/out/arm/common/etc/permissions/com.google.android.media.effects.xml
new file mode 100644
index 0000000..ea82b9d
--- /dev/null
+++ b/out/arm/common/etc/permissions/com.google.android.media.effects.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<permissions>
+    <library name="com.google.android.media.effects"
+            file="/system/framework/com.google.android.media.effects.jar" />
+
+</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml b/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml
new file mode 100644
index 0000000..f75abf9
--- /dev/null
+++ b/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+      Copyright (C) 2011 Google, Inc.  All Rights Reserved
+-->
+<permissions>
+    <library name="com.google.widevine.software.drm"
+        file="/system/framework/com.google.widevine.software.drm.jar"/>
+</permissions>
diff --git a/out/arm/common/framework/com.google.android.camera2.jar b/out/arm/common/framework/com.google.android.camera2.jar
new file mode 100644
index 0000000..8bc83cb
Binary files /dev/null and b/out/arm/common/framework/com.google.android.camera2.jar differ
diff --git a/out/arm/common/framework/com.google.android.maps.jar b/out/arm/common/framework/com.google.android.maps.jar
new file mode 100644
index 0000000..02524f6
Binary files /dev/null and b/out/arm/common/framework/com.google.android.maps.jar differ
diff --git a/out/arm/common/framework/com.google.android.media.effects.jar b/out/arm/common/framework/com.google.android.media.effects.jar
new file mode 100644
index 0000000..4cc5668
Binary files /dev/null and b/out/arm/common/framework/com.google.android.media.effects.jar differ
diff --git a/out/arm/common/framework/com.google.widevine.software.drm.jar b/out/arm/common/framework/com.google.widevine.software.drm.jar
new file mode 100644
index 0000000..52b38cb
Binary files /dev/null and b/out/arm/common/framework/com.google.widevine.software.drm.jar differ
diff --git a/out/arm/common/gapps_scripts.sh b/out/arm/common/gapps_scripts.sh
new file mode 100644
index 0000000..6b0f5dd
--- /dev/null
+++ b/out/arm/common/gapps_scripts.sh
@@ -0,0 +1,28 @@
+#!/sbin/sh
+
+good_ffc_device() {
+  if cat /proc/cpuinfo |grep -q Victory; then
+    return 1
+  fi
+  if cat /proc/cpuinfo |grep -q herring; then
+    return 1
+  fi
+  if cat /proc/cpuinfo |grep -q sun4i; then
+    return 1
+  fi
+  return 0
+}
+
+chmod 755 /system/addon.d/30-gapps.sh
+if [ -f "/system/addon.d/faceunlock.sh" ]; then
+    chmod 755 /system/addon.d/31-faceunlock.sh
+fi
+if good_ffc_device && [ -e /system/etc/permissions/android.hardware.camera.front.xml ]; then
+  chmod 755 /system/addon.d/31-faceunlock.sh
+elif  [ -d /system/vendor/pittpatt/ ]; then
+  rm -rf /system/vendor/pittpatt/
+  rm -rf /system/app/FaceLock/
+  rm  -f /system/lib/libfacelock_jni.so
+  rm  -f /system/addon.d/31-faceunlock.sh
+fi
+rm -rf /tmp/face
diff --git a/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
new file mode 100644
index 0000000..4589c91
Binary files /dev/null and b/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk differ
diff --git a/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk b/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk
new file mode 100644
index 0000000..5217ccd
Binary files /dev/null and b/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk differ
diff --git a/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk b/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk
new file mode 100644
index 0000000..685d1bd
Binary files /dev/null and b/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk differ
diff --git a/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
new file mode 100644
index 0000000..4dac6c7
Binary files /dev/null and b/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk differ
diff --git a/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
new file mode 100644
index 0000000..dcdba29
Binary files /dev/null and b/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ
diff --git a/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
new file mode 100644
index 0000000..2523747
Binary files /dev/null and b/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ
diff --git a/out/arm/common/priv-app/Phonesky/Phonesky.apk b/out/arm/common/priv-app/Phonesky/Phonesky.apk
new file mode 100644
index 0000000..588ce53
Binary files /dev/null and b/out/arm/common/priv-app/Phonesky/Phonesky.apk differ
diff --git a/out/arm/common/priv-app/SetupWizard/SetupWizard.apk b/out/arm/common/priv-app/SetupWizard/SetupWizard.apk
new file mode 100644
index 0000000..0a208e4
Binary files /dev/null and b/out/arm/common/priv-app/SetupWizard/SetupWizard.apk differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
new file mode 100644
index 0000000..eeb495e
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
new file mode 100644
index 0000000..8292c58
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
new file mode 100644
index 0000000..90292d4
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
new file mode 100644
index 0000000..bccd30a
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
new file mode 100644
index 0000000..343e4ea
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
new file mode 100644
index 0000000..6708d71
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
new file mode 100644
index 0000000..dbca576
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
new file mode 100644
index 0000000..5d8f45f
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
new file mode 100644
index 0000000..997f486
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin differ
diff --git a/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin b/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
new file mode 100644
index 0000000..cf6386c
Binary files /dev/null and b/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
index 922b876..9dadc7a 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
index 689839c..712a056 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
index 1e97030..b0c048d 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
index b850276..12da616 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
index 91aa344..aa890ee 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
new file mode 100644
index 0000000..aff3661
Binary files /dev/null and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
index 0e8b63f..3d53bf0 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
index f8e466c..63401b1 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
index 0704098..b5087e4 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
index 50e9fa8..2966172 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
index a0e6953..8c68b1f 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
index b4a19f8..e18424c 100644
Binary files a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so differ
diff --git a/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
new file mode 100644
index 0000000..fe32c33
Binary files /dev/null and b/prebuilt/gapps/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so differ
diff --git a/prebuilt/gapps/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/prebuilt/gapps/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
new file mode 120000
index 0000000..30b7122
--- /dev/null
+++ b/prebuilt/gapps/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
@@ -0,0 +1 @@
+/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
index 665c425..2523747 100644
Binary files a/prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/prebuilt/gapps/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ