Merge changes I4665c1fb,I3d9b8dd9 am: b5bd9f4142

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

Change-Id: I59b39abea365e8c79e3f50cc079b315a31e45986