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

Change-Id: I00fc697bc964fc9358b0ed8dd3ad806c1c9c465b