Merge changes I28163794,I83e65dd5 am: 7a806c4de3 am: 13ce48bdd3

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

Change-Id: I916e6b43faa07ceb48cbefe229ce5ac96ecd17d8