Merge changes I4b8773f8,I1a6798a3 am: cf78c9c6b9

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

Change-Id: I2f1123dd92c4c7d000c6650d1d9da92c6e6b18bd