Realign flo device tree with AICP

Change-Id: I8dab85b7abcfc1f6f526fcdec93ddfb099215482