Merge changes I55f26e97,Iec044d31 am: ec6b3a9781 am: bc6b7b28e1

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

Change-Id: Ide29f86f33bf5457493cc2581ceac9d81f08d09c