Merge changes from topic "fix-omx-dependencies" am: b403048401
am: 75d8c3aa29

Change-Id: I5cca13735c28df8a300878a52b5e2a70cb813bdd