Fix patch path after reorg of files into contrail subdirs