Properly inherit cfx vendor

Change-Id: I7748b4211732753a9123aa05c1e9eae634129117