Merge changes Ifd855e5e,Ia370469b am: e4d35ba805

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

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