Merge changes I0eafb136,I6d0d7788 am: 1c2b29967b

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

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