Merge changes I7b8a2794,I42b46ee4 am: baa1b0342e am: 06a207999c

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

Change-Id: I4d809b26b974894f9854aa5f27c2dca3abd24d53