Merge "StreamHalHidl: Minor cleanup on destructor"