Merge changes I0461120a,Id67d6280

* changes:
  Support multiple files per partition.
  Create composite disk image in VirtualizationService.