Merge changes I4b8773f8,I1a6798a3 am: cf78c9c6b9 am: a6c5260489

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

Change-Id: I5ee6a7757ae8772607d91eae130bfd5eeba321b2