Rebase device tree against AICP

Huge thanks to LorDClockaN (AICP)

Change-Id: I754286d0469578938309206e535391710209424f