am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt

Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
  Windows SDK: support tools/sdklauncher and tools/layoutopt