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

Change-Id: I49b44da602052b2b83db4fd77ada308202bedf7d