Merge "Bug fix for leak in httplive_fuzzer" am: b7aacccf42 am: fc70a0bd6b am: a958cbc3a9 am: 0e69307595 am: 1e65ddf07a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1814836

Change-Id: Ia3d412a5bb81753c0b1ec26f13ad0b97360105da