am b20e9851: am 25ffaff6: am 86b12152: fix windows SDK build