Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp * commit '420b59fe215f8a912e66759d1c4a252bea3df39d': Fix windows SDK build.
Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp * commit '420b59fe215f8a912e66759d1c4a252bea3df39d': Fix windows SDK build.