Merge "Revert "Fix WIN SDK build: don't break if emulator-x86 is missing.""