Merge "libvulkan: revert the false surface support implementation"