Merge changes Ic816b68d,Ie317a680 am: bcbf35a0a5 am: f7740307c8

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

Change-Id: I8aa93c3ca49253dd2365cda8996048d6a1337a26