Merge "Revert "swiftshader vk: pass through cpu device type""