Revert "Fix memory leak"

This reverts commit 91433082cf3a882b4e38f4ae58afbe5216a74850.

Reason for revert: b/166682761 - build failures on rvc-dev branch

Bug: 166073521
Bug: 166682761
Test: a cherry-pick from aosp/master

Change-Id: I697fbdd71a3ea158eb4ec0806bedc1f014a0f34c
Merged-In: I697fbdd71a3ea158eb4ec0806bedc1f014a0f34c
(cherry picked from commit 7f9283bffd0ea22284feadabe9f78d09ebe367a4)
1 file changed