Merge branch 'cm-11.0' of Cyanogenmod/android_device_htc_evita into cm-11.0