Fix ingestion to be more robust

BUG=skia:
TBR=bensong

Review URL: https://codereview.chromium.org/822443002