EC2: allow building S3-backed HVM ami's

(cherry picked from commit e007559e9580c134f43ea9dc2279ff41cb3bd015)