am 35f147a8: am 0a3ad26a: Merge "Include libmm-omxcore in mako builds." into jb-mr1.1-dev

* commit '35f147a8b151d943a389e063424f3c37acad0a68':
  Include libmm-omxcore in mako builds.