Merge changes Iaf918ce3,I60032b97

* changes:
  Introduce vendor.mime.types
  android.mime.types: Fix typo.