Bring flo|deb|mako back home to Vanir

Change-Id: Iee1986de315a475a8089b8e63c267cce03b359fe