Merge "Avoid attempting to free invalid buffers" into main am: 0b6cc9526a

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2754952

Change-Id: Iad6c4ace93b4822c43875ae04a343b2eeabd20c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>