Merge changes from topic "fix-omx-dependencies" am: 2dac833ea8  -s ours am: 359358789a  -s ours
am: 67525dde9c  -s ours

Change-Id: Idefebc7260c1f0940c274fbd13c10a8031206037