Merge "Tweak framework-mime / mimemap dependencies." am: 8f05b2ef50
am: c21fae57f8

Change-Id: I59f650eee4d7861e5d539be3a88c72bc17e13ad2