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

Change-Id: I9fe70f6e9fd8aae52a3e3f8ee140972513fb091f