Merge changes from topic "fix-omx-dependencies" am: d429b1f9e7 am: 4e8e84e10b am: 4b5313cbdf
am: c36e35f5a7

Change-Id: Id44fa23e3d441ee10785589ad977f6d7a2d6422d