Merge changes from topic "move-vulkan-headers"
am: 22a3ef220a

Change-Id: Ie1f2d70e9bb969f6df46c346f4e6739931297e20