Merge "mesa: Fix broken GALLIUM_LIBS addition" am: 706e20fc31

Change-Id: I770ad09cf545110a9f993ade19ee746c6e08b5e5