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

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