Merge "Fix libmedia includes." into oc-dev