Merge "Cleanup dvr_api.h to make it closer to the exported SDK version"