[US21.2] Better merge official patch to fix video recording memory leak than writing a custom one

Commit: c53a7a79adb8d85276f4ae63876baa11e1e49048
https://android.googlesource.com/device/generic/goldfish/+/c53a7a79adb8d85276f4ae63876baa11e1e49048