Merge changes I789b39d4,I711b6509 am: 38c7b43873 am: 1c0b4daa99

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

Change-Id: I09b532728c2b168687771cdda67865ce983200f5