Merge "Use Frankfurt M4 version of ccsdk/features"

No match.