Merge "Remove TARGET_NODE_OS variable"