Use kernel/google/common for flo no need to track two copies

Change-Id: Ie4459fbdf4d3d0cfbced7b9dfe24a16c16476194