Clean up DvrSettings

and move to dvr package

Test: make;
Change-Id: Ia2e345837c253a772d7a6df8616cfa7e3ac04479
4 files changed