[automerger skipped] Merge changes from topic "move-vulkan-headers" into qt-dev
am: 7f2d108af9 -s ours
am skip reason: change_id If4677d08a6891b18ce347e3fa3be393fc6111fc8 with SHA1 c6882b4814 is in history

Change-Id: Ia8c8e88d0b94649aa5359fc0ca630a14f57c36a0