Merge "Make libdvr a shared library" into oc-dev