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

Change-Id: Ic4344b56bf1ea766114bf6a0faaeb0b47c064651