Merge "omx: Removed dead files." into oc-dev