Battery Icon Styles (1/2)
Restore CyanogenMod battery icon styles and add the AOKP CircleMOD style.
Currently, the dock icon doesn't play nice with PA's per-app color setting.  The color fills the entire icon and doesn't change colors properly.

Change-Id: I381f420e2b401bec55b2098aeea1405f05377209
Add Phone and Phablet UI detection (1/2)
Gives us more control over what options are displayed in Settings depending on the layout.

Change-Id: I35fc6636906b548fcb61efd350687e72ad4e8834