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

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