Inline calls to MimeUtils, step 2.
am: ebbb02c407

Change-Id: I8966615d27b264bfa624a1cec78896ec21e1032b