Merge change I15034878 into eclair

* changes:
  Fix Windows SDK build broken by layoutopt change.