Merge changes from topic "gfxstream-build-libnames" into main am: 3d2a2e0c07 am: 9fc41b6055

Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/2980333

Change-Id: Ibc8b025a3b574d31fd1b92d3f869a81fba7bcba7
Signed-off-by: Automerger Merge Worker <[email protected]>