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

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

Change-Id: Icbf435073b1374843aabfd65fdeac23ca98eced9