Merge "Revert "Add 2 addtional VkFormat's to vkGetPhysicalDeviceSurfaceFormatsKHR"" am: 19c8513c7b am: 445ec6d2cf
am: 2734c0f3b6

Change-Id: Ie1633f895da8d4c4593b4f8b5ff7d813dffabb42