Fix memory leak

b/11184427
b/11261713

Change-Id: Ie71675e4d60e1366cb042e9d0588762097925187
am 97fe197d: Fix memory leak

* commit '97fe197df913aea1a1f436d6e44100ff75a54c82':
  Fix memory leak
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1