Add a5 from desire816_dev

Change-Id: Ic416879f858542dbed7ba22ba8db9a8f6a521563
Merge branch 'cm-11.0' of git://github.com/TheMuppets/proprietary_vendor_htc into cm-11.0