Merge "Move wayland support from default build" into rvc-dev am: 37ede275a6 am: 4b4e20ec16

Change-Id: I6c5c7c3cc15db93bdbd6718112a011923d4d6d86