Merge change 23106 into eclair

* changes:
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter choose the cluster-size