am 08ab72b3: am 6f5cb991: am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e'

* commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e':
  Fix the Windows SDK build for the development to sdk split.