Merge remote-tracking branch 'aosp/upstream-cros-master' am: f65eccb0b9 am: 1736c62e6d am: 18bc0f0582 am: 3c8378b905 am: ef7d5b5b2f

Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1831677

Change-Id: Ie9b772e3aa6feff5710664b6dd9d198c35c40f2a