[automerger skipped] Clean reimport of Wayland core sources 1.17.0 am: 049d87ca33 am: bcdc69d383 -s ours am: 6b57da736a -s ours am: 6cbf14f5ad -s ours

am skip reason: Change-Id Iee8152f1a730230d1b7c06261a00719a9e55fec6 with SHA-1 449f5b9ced is in history

Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1578863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5301614688d95a076d6dd5afd21e84b5e71dbc3