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

Change-Id: I5fd4d6beb59bbfd27e5dc3f3147b9128af81a8b5