Forward port battery icon options [1/2]

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

Still retains new options for where to display battery percentage text.

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234
Fix Build

Time to get some sleep....

Signed-off-by: Dragon <dragon7780@hotmail.nl>