Merge "Include libmm-omxcore in mako builds." into jb-mr1.1-dev