[automerger skipped] Skip unknown mime types instead of failing am: e80d568140  -s ours am: 164bf1a642  -s ours
am: d37448a2d0  -s ours

Change-Id: I465e0c14ef0aa420609d468c4cf7e78cef8e24e7