am 484fe4d6: Merge change I06fb2c1c into eclair-mr2

Merge commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f' into eclair-mr2-plus-aosp

* commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f':
  Hopefully fix Windows build