Merge changes Id043315c,I3f2bc097,Id380ea00,Ie5a9fbb1 into main am: 11167383f2 am: 55fa5e39e3 am: 42e8daeb5d

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

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