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

Merge commit 'c9050c59ea582c74f70ef2f1c87616c6919b0714'

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