Merge "C2SoftMpeg4Dec: Fix memory leak in onRelease" am: 9323cb4839 am: d19d5cfb91 am: 7032075ec5 am: 44725cfc4b

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

Change-Id: I704d65f627c8ce5ef588dd6749ffa68741da7613