Merge "Revert "Turn on vk unit tests"" into udc-dev