Allow full_evita name
Unify htc-msm8960 device tree layouts