Merge "Remove libbufferhub mocks/" into oc-dev