Merge "Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR""