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

Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp

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