Merge changes I828a75fd,Idcb80ad9,Id7dbc0e1,Ic55a0b22 am: 06fa2579e4

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

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