Merge "Make libdvr a shared library" into oc-dev
am: 1ca4674b72

Change-Id: I4257eb8f7e0b3492b606fb4a96eeeeef2f76627c