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

Change-Id: Id06c5e5047a7df2fa084d6fbc2536a54919550a2