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

Change-Id: I776dc849262326097cd031d95470981619164916