Merge "Clear callbacks when destroying DvrHwcClient" into oc-dr1-dev am: 222b760089
am: cf14ce0995

Change-Id: I955f9dfa14e9772103fd7fc7a00a29757228f26a