am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target

Merge commit '2dfe490f439e126119055e1888703cc3745f5389' into eclair-plus-aosp

* commit '2dfe490f439e126119055e1888703cc3745f5389':
  system: vold: Ensure a default vold.conf exists for generic target