Merge "Use external/mime-support's mime.types rather than libcore's copy."
am: d6aa477ff9

Change-Id: I15c1ce13021d389272f64cb07baa60798dbbee60