Merge changes from topic "fix-omx-dependencies" am: 02f2f613e8  -s ours
am: 3e84f0fa0a  -s ours

Change-Id: I4342f87e51a0ddc0217ccfed60f399f584436ce4