Merge "Revert "Add vkCmd* device extension functions""