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

Change-Id: I0dd9b4270feb3516dff585d1c71f6232389cecfc