[upstream] Bring forward MesaLib patch