am ca35b275: Merge change I15034878 into eclair

Merge commit 'ca35b27533f920f304c6065537ffc5185c2022e5' into eclair-mr2

* commit 'ca35b27533f920f304c6065537ffc5185c2022e5':
  Fix Windows SDK build broken by layoutopt change.