Merge "Fix makefile include for support-v4" into oc-dev
am: 49496305fa

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3