Phone Info to Team UB layout and AOSP 5.02r1

(cherry picked from commit 25bad68e10f1bc49fe5d6d68e756dba7ea2bec45)

Conflicts:
	res/values/cr_strings.xml
	res/xml/device_info_settings.xml
Team UB settings menu layout

(cherry picked from commit 08d97b48e7f0aff6518ee8ec54df458bc2497274)

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/util/CMDProcessor.java
	src/com/android/settings/util/ChildProcess.java
	src/com/android/settings/util/CommandResult.java
	src/com/android/settings/util/Helpers.java
remove double

(cherry picked from commit 65182e9535557b231d4b662aa70e52febe2cbb21)
app bar

(cherry picked from commit 0811268078479d98a92e296c79963d5ca09867c0)
Revert "Intergrate Viper4Android into settings"

This reverts commit 9d7b6c2a8ba8041451a084fbf64f5ca0c9c8dcb9.

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/SettingsActivity.java
Intergrate AudioFX into settings

Conflicts:
	src/com/android/settings/SettingsActivity.java

Conflicts:
	res/values/cr_strings.xml
	res/xml/dashboard_categories.xml
Revert "Only show backlight option if hw keys disabler is "true" in device overlay"

This reverts commit 4bf58c71f02e603fa0dd1ab4b3d836dd73ef2d0b.

(cherry picked from commit 1ac701dc177c624cbb1735704716d23c389bb262)
Extra Settings