Merge "Fix makefile include for support-v4" into oc-dev