Merge changes from topic "fix-omx-dependencies"
am: d429b1f9e7

Change-Id: Ic50e4bc973f6a16f0ed1a1f051dc354e69b0e39d