Fetch Flo kernel and rename both

Change-Id: I33aae3230f6a03f025d7c88095d82e5dd5a4d374