CM has its own customisations for battery icons and percentage.
Revert the unnecessary CAF patch.

This reverts commit 7140288c.

Change-Id: Id4c34a4cc4400490a8a82ebd5a3654232377650e