Merge changes from topic "revert-1689266-YWHVEPCRJQ" am: 8bb5b377bb am: aecffe7ef5 am: a065bb9d7a

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

Change-Id: Id593408bfc9b5be9f2421b415dd0f63b688be29a