Merge "Fix memory leak in buildExtensionString" am: ad5012d769

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

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