zenfone6: Switch to Asus Camera and Gallery

Change-Id: I88a0cc7007a0d750a64f5f6d72fc428baba2dac8
diff --git a/device.mk b/device.mk
index ccc0238..c96282b 100755
--- a/device.mk
+++ b/device.mk
@@ -65,10 +65,6 @@
 PRODUCT_PACKAGES_DEBUG += \
     bootctl
 
-# Camera
-PRODUCT_PACKAGES += \
-    SnapdragonCamera2
-
 # Charger images
 PRODUCT_PACKAGES += \
     omni_charger_res_images \
@@ -155,6 +151,11 @@
 PRODUCT_PACKAGES += \
     vendor.display.config@1.5
 
+# Remove unwanted packages
+PRODUCT_PACKAGES += \
+    RemovePackages \
+    RemovePackages1
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)