am 4ad30d28: Merge change 23106 into eclair

Merge commit '4ad30d2885a801ee23fb44c1edcda051905868c9' into eclair-plus-aosp

* commit '4ad30d2885a801ee23fb44c1edcda051905868c9':
  vold: Format cards < 2GB as FAT16, otherwise FAT32. Also let the formatter