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

Change-Id: I51128c70d8afec47e42b2d72a3529eb3e93962a8