Set the Content-Type of a file during the S3 upload request.

We were setting the Content-Type in a separate request, which was
pointless. We now set this along with the initial file upload.

Reviewed at https://reviews.reviewboard.org/r/6395/