Merge "Remove obsolete windows sdk files"
am: 34ce035aa6

Change-Id: I5f1d572b71c131bfe6bca60b20786315c66a8e80