Merge "Correct the Mesa version information." am: 617aee463c am: 9f62ced05c

Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2271353

Change-Id: Idbfe3d65f844ad7f2de0ac0e4acb6684888b7dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>