Merge "Fix makefile test against host os."