Merge "Clean up windows sdk build"
am: f00581b07c

Change-Id: I1b444af1e84f03fac0ca4f60a5bb5f7b9144b81a