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

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

Change-Id: Iadec4c5a883e5dbc43dd73089d134d59361bbe7c