Merge "Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR""
am: 19c8513c7b

Change-Id: Id730b41f30c0d910364ed3c76dbd42f2fc7b3171