[automerger skipped] Sync chromium wayland protocol with Chrome am: b00e312211 am: c96cddd803
am: 4a6e7fdc56 -s ours
am skip reason: change_id I45abcfde4dccda503cdb7bbbf5939970f03d7b3a with SHA1 87869f3d85 is in history

Change-Id: I4997aa2e5bd2d9c64752d63da9dd156bfc0fe6b5