am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-plus-aosp

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
  Fix the Windows SDK build for the development to sdk split.