[automerger skipped] Skip unknown mime types instead of failing am: e80d568140 am: 9f6d0c69f3  -s ours am: bf327f9965  -s ours
am: 6aebd8410e  -s ours

Change-Id: Ifd6e4f24ff409c1c2f09a58ef3eddcf5d7553ecb