Merge changes I4b8773f8,I1a6798a3 am: cf78c9c6b9 am: a6c5260489 am: 4e9b0b5a0e

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

Change-Id: I523874c84e1ead172a957bda65fb5dfbc778ad5c