Merge e021b1079632b294d089d711f4f92cac5bd4a364 on remote branch

Change-Id: I130e75b99219ab3042605a34f28536a80fb009b0
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ca16196..62ca5ad 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -175,6 +175,4 @@
 DIRECTED_RECOVERY_SNAPSHOT := true
 DIRECTED_RAMDISK_SNAPSHOT := true
 
-include device/qcom/qssi/vendor_snapshot_modules.mk
-include device/qcom/qssi/recovery_snapshot_modules.mk
-include device/qcom/qssi/ramdisk_snapshot_modules.mk
+-include vendor/qcom/vsdk-configs/snapshot_modules/*/*.mk
diff --git a/ramdisk_snapshot_modules.mk b/ramdisk_snapshot_modules.mk
deleted file mode 100644
index 6c578f9..0000000
--- a/ramdisk_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RAMDISK_SNAPSHOT_MODULES :=
diff --git a/recovery_snapshot_modules.mk b/recovery_snapshot_modules.mk
deleted file mode 100644
index 18d1f01..0000000
--- a/recovery_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RECOVERY_SNAPSHOT_MODULES :=
diff --git a/vendor_snapshot_modules.mk b/vendor_snapshot_modules.mk
deleted file mode 100644
index 0b08985..0000000
--- a/vendor_snapshot_modules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VENDOR_SNAPSHOT_MODULES :=