Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev