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

Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp

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