Revert "Realign flo device tree with AICP"

This reverts commit 149544a2968378e45de06851561fc42db8c68126.

Change-Id: Icebcd050f0290a6dcd3f1da5cac416aba4a4f284