Merge "Improve VK_MAKE_VERSION and VK_BIT macros" into nyc-dev