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

Change-Id: I0912acb71fc672f1574d9bc920be0209dbbdc579