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

Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-plus-aosp

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