Merge changes If668ed31,I5f6df09b am: 84f26f0fb9 am: 6ef5d853d5

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

Change-Id: Icf2cd231c1ac7c67eb291d6942fe1db05cd418b0