Merge change 6444

* changes:
  Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."