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

Change-Id: Icf153973838c0e202dbfd4cd26ee2cff3a1368ed