Inherit CFX vendor

Change-Id: I939b9b1a886ee315b2f271db7feeedeaef5a0f6b