Move updateFileCounts to the upload controller

...mostly.

This method had a lot of step-specific stuff in it, but it's
looking much neater now.

It'll improve as I move more things out into the Upload step.

Change-Id: I5a1be4ae4b4bf42f12fd599b626e5b132ae7ea30
Merge "Move updateFileCounts to the upload controller"