Merge "Stop disting the monolithic Windows SDK" am: c7e050889a

Original change: https://android-review.googlesource.com/c/platform/development/+/1828993

Change-Id: Ie0cd33154a4f55f5a0e9647bac35529a88015940