Merge the 2021-08-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  encoder: fix invalid free of raw buffers

Change-Id: Ia93ddc2671c2857097aa4d1a5c1dd00d13bbc29a