Merge "Split libdvr_headers from libdvr: Step 1" into oc-dev am: 2eb4922a7b
am: 41b7c72e56

Change-Id: I3a9231506b463c6915df0330db852cd1b62bcfe3