Unify htc-msm8960 device tree layouts