Merge "Merge "Move Windows SDK whitelist out of main.mk""