am c3d743d2: am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp

* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
  Fix a Windows-only discrepency in the Windows SDK build.