herp derp: can't remove these

Change-Id: I80fd546a4fd47dd8b0ae5674fa92ae8ce7f7cade
Merge branch 'cm-11.0' of https://github.com/Mustaavalkosta/android_device_htc_ace into cd-4.4