[automerger skipped] Merge "Tweak framework-mime / mimemap dependencies." am: 8f05b2ef50 am: c21fae57f8
am: 6ecd9b025e -s ours
am skip reason: change_id Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90 with SHA1 c0c06088f0 is in history

Change-Id: Idb5e1a8895c81f367e18f5e0b6bc4b0b6d642ea4