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

Change-Id: I43f53a8a08b6c6fbae7f926c5471ae3e20973d57