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

* commit '6d65635ef70186edae65cd7a7b56f885fbddd3bc':
  Remove legacy windows platform build support