mesa,mesa-gl: Fix build when dri3 is not enabled

Some machines e.g. odroid-c4 disable dri3 and it now fails to build
mesa-gl e.g.

| aarch64-yoe-linux-ld.lld: error: undefined symbol: dri3_check_multibuffer [3/5]
    | >>> referenced by drisw_glx.c
    | >>>               libglx.a.p/drisw_glx.c.o:(driswCreateScreenDriver) in archive src/glx/libglx.a

Apply patches from a pull request which is already submitted upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>