Can't build a ICS device tree on CM10. Merging branch and correcting.