N5120: Switch to CM's device tree now that we have official support

Change-Id: I0a9442fbf59f8ff175798776cd9fb2b1fcc31e2f
Fixed build error (line 117 that's been there forever, seemingly).

Change-Id: I7b2c8325e8a00e525e7c6e4580efbe6150eaca45
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4