merge from open-source master

Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 329be7f..380bb60 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -7,7 +7,7 @@
 	etc/dbus.conf \
 	etc/hosts
 
-ifeq ($(TARGET_PRODUCT),generic)
+ifeq ($(TARGET_PRODUCT),full)
 copy_from += etc/vold.fstab
 endif