am 08ab72b3: am 6f5cb991: am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.
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.

xorware/android_build,xorware/android_build,Hybrid-Power/startsync,knone1/platform_manifest,RR-msm7x30/platform_manifest,hagar006/platform_manifest,ND-3500/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,see4ri/lolili,fallouttester/platform_manifest,pranav01/platform_manifest