This reverts commit 006506278a. It needs to be reverted to fix b/38343960 on marlin. This change is not needed since the root cause of the resource leak was addressed in ag/2226738. Change-Id: I93b64d39103d574b7dcde6b1477839a50b64aefd
006506278a