am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.
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.

xorware/android_build,xorware/android_build,hagar006/platform_manifest,ND-3500/platform_manifest,knone1/platform_manifest,RR-msm7x30/platform_manifest,pranav01/platform_manifest,Hybrid-Power/startsync,xorware/android_build,xorware/android_build,xorware/android_build,fallouttester/platform_manifest,see4ri/lolili