Status bar brightness control from CM10 (2/2)

Patchset2+3 cleanup

Change-Id: I9d352635fce4dd045ac227c93220c15c74e38175

Conflicts:
	res/values/strings.xml
	src/com/android/settings/aoip/StatusBar.java