Merge changes from topic "fix-omx-dependencies" am: d429b1f9e7
am: 4e8e84e10b

Change-Id: I0c32b0b0c893f785b7f1f84e44f989473718cf8d