Merge latest cm-10.1 device tree + some clean-up