Merge "libvulkan: cleanup some redundant codes"