Inherit CFX vendor

Change-Id: I25a10a22c076093fec8ac2af682fffb60f56454a