Merge "Remove reference to support-v4-prebuilt" into oc-dev