am e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""

* commit 'e77542205f36f063c68407a7de0af2ce80e856d3':
  Merge "Move Windows SDK whitelist out of main.mk"