[2/2] Settings: Add an option to change the device hostname

This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.

PS4
move to end of first section

Change-Id: Ib04d551b7eb31110962709e0d956db4da380175a

Conflicts:
	res/values/custom_strings.xml

Conflicts:
	res/values/illusion_strings.xml
[2/2] Settings: Optional statusbar battery icons

    * Circle battery and circle battery percent (from CM <Sven Dawitz>)
    * Battery bar percent from Google
    * Quicksetting battery tile reflects status icon (from SlimROM <kufikugel>)

    - Option appears under Settings -> Battery -> Status Icon (ActionBar)

Part 1: frameworks_base

Patch set 1: clean white spaces
Patch set 2: fix conflicts
Patch set 3: rebase + why do some weird actionbar menu?

Signed-off-by: Anu6is <curtis.mayers@gmail.com>

Change-Id: Iae497e495045ca68522ab0b5bd342e044d4000f3

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/power_usage_summary.xml
	src/com/android/settings/fuelgauge/PowerUsageSummary.java