meta-raspberrypi: conflict between wayland and userland in providing libwayland-egl

I observed that images which include tools-profile in IMAGE_FEATURES systematically fail to build with:

ERROR: libepoxy-1.5.0-r0 do_prepare_recipe_sysroot: The file /usr/lib/libwayland-egl.so is installed by both wayland and userland, aborting
ERROR: libepoxy-1.5.0-r0 do_prepare_recipe_sysroot: Function failed: extend_recipe_sysroot
ERROR: Logfile of failure stored in: /home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/libepoxy/1.5.0-r0/temp/log.do_prepare_recipe_sysroot.28767
ERROR: Task (/home/gizero/work/smartliving/distro/repo-master/build-poky/conf/../../layers/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb:do_prepare_recipe_sysroot) failed with exit code '1'

Happens with custom “debug” image, but it’s reproducible with core-image-minimal when EXTRA_IMAGE_FEATURES includes tools-profile. Cleaning up relevant recipes doesn’t help. Removing tools-profile brings things back to normality.

This happens with the following commits:

Build Configuration:
BB_VERSION           = "1.37.0"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "arm-poky-linux-gnueabi"
MACHINE              = "raspberrypi3"
DISTRO               = "poky"
DISTRO_VERSION       = "2.5"
TUNE_FEATURES        = "arm armv7ve vfp thumb neon vfpv4 callconvention-hard cortexa7"
TARGET_FPU           = "hard"
meta
meta-poky
meta-yocto-bsp       = "HEAD:f4c938c47424424b89cde2269bd92cebc9a6ac1a"
meta-raspberrypi     = "master:53af636f88d13141e70e53bc33d571a207122b03"

I haven’t noticed it in the past with the same images. Any recent change either on poky or in this repo that come to mind? I’m happy to further investigate on this, but I probably need a hint what to look for…