am 86b12152: fix windows SDK build

Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into froyo-plus-aosp

* commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a':
  fix windows SDK build