am 47c4bbe9: Package the proper vold config file in SDK system image.

Merge commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2' into froyo-plus-aosp

* commit '47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2':
  Package the proper vold config file in SDK system image.