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

Change-Id: I84efc214e668bd17bfa7f59797fdaa7344772b61