Merge "libcutils: win_sdk build issues"