Clean Up device tree to reduce any conflicts during bootup
Merge branch 'cm-11.0' of https://github.com/TamsuiCM11/android_device_sony_nanhu_ds into cm-11.0