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

Change-Id: I9ef61f438d186011142f9c0802a0eab4dbb99b4f