Merge "Add vfc submodule"