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

Change-Id: I65d5872e936362b26984bd8944dcfe8523098deb