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

Change-Id: Ic22aa338a6fe1027a122986d308db474c76edf47