[automerger skipped] Merge Android R am: d2ace5d9f0 -s ours am: f0a18d4ef8 -s ours am: eac4383b06 -s ours am: 888e13ab40 -s ours

am skip reason: Change-Id I0eaecb66e1815442d69d3e0c1e8da1d7e7dc8d58 with SHA-1 0e46d4adfc is in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/SPIRV-Headers/+/1422331

Change-Id: Ib967916a0a746c9144d025e7f8ec0b3d47bf076c