Merge "SDK: Enable "make sdk/common" under Windows"