am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"

* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support