Merge "Fix corner case for render buffer reference count" into tm-dev am: 2ed4577f61 am: fddbed1035

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

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