am b3edd072: vold: Change the disk formatter we use + fix commandline argument creation

Merge commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e'

* commit 'b3edd0720ea26ef02763e7446d1bafb85546b38e':
  vold: Change the disk formatter we use + fix commandline argument creation