Merge "Clean up RBO destroy code and fix regression" am: c42560cc9d

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

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