flo: Rebase device tree to current AOSP state

Change-Id: I63af0866e96479fb1718b5d8a27f70a0b2b11732