Fix memory leak when blake is removed

Fix memory leak when blake is removed

Bug 200168010

Change-Id: I3310d0e3aca17a4aed9610e42522786c3d661fc9
Signed-off-by: Eric Miao <emiao@nvidia.com>
Signed-off-by: Li Li <lli5@nvidia.com>
Reviewed-on: http://git-master/r/1000107
(cherry picked from commit 4870486c932aba8b8541129ca12666c4e7f6aead)
Reviewed-on: http://git-master/r/998343
(cherry picked from commit 7a8c24d46d0de35769d867099c537a79bc89f6d0)
Reviewed-on: http://git-master/r/1012540
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>